# small refactoring + formatting for clarity

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/RaceStateListener.java

@@ -34,6 +34,5 @@ public class RaceStateListener implements RaceStateChangedListener {
     @Override
     public void onStartProcedureSpecificEvent(TimePoint eventTime, Integer eventId) {
         service.handleStartProcedureSpecificEvent(race, eventTime, eventId);
-        
     }
 }

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/racelist/RaceListAdapter.java

@@ -40,9 +40,8 @@ public class RaceListAdapter extends ArrayAdapter<RaceListDataType> {
     private List<RaceListDataType> items;
     private List<RaceListDataType> originalItems;
 
-    public RaceListAdapter(Context context, int textViewResourceId, List<RaceListDataType> objects,
-            JuryFlagClickedListener juryListener) {
-        super(context, textViewResourceId, objects);
+    public RaceListAdapter(Context context, List<RaceListDataType> objects, JuryFlagClickedListener juryListener) {
+        super(context, 0, objects);
         this.items = objects;
         this.originalItems = new ArrayList<RaceListDataType>();
 

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceInfoFragment.java

@@ -131,11 +131,6 @@ public class RaceInfoFragment extends RaceFragment implements RaceStateChangedLi
         transaction.commit();
     }
 
-    public void onRaceStateChanged(RaceState state) {
-        updateCourseDesignLabel();
-        switchToInfoFragment();
-    }
-
     public void onResetTime() {
         switchToInfoFragment(SetStartTimeRaceFragment.create(getRace()));
     }
@@ -156,16 +151,6 @@ public class RaceInfoFragment extends RaceFragment implements RaceStateChangedLi
         updateCourseDesignLabel();
     }
 
-    @Override
-    public void onStartTimeChanged(TimePoint startTime) {
-        //do nothing (onRaceStateChanged(RaceState) handles state change and fragment switch already
-    }
-
-    @Override
-    public void onRaceAborted() {
-        //do nothing (onRaceStateChanged(RaceState) handles state change and fragment switch already
-    }
-
     private void showRaceResetConfirmationDialog() {
         prepareResetRaceView();
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
@@ -224,6 +209,22 @@ public class RaceInfoFragment extends RaceFragment implements RaceStateChangedLi
         //do nothing
     }
 
+    @Override
+    public void onRaceStateChanged(RaceState state) {
+        updateCourseDesignLabel();
+        switchToInfoFragment();
+    }
+
+    @Override
+    public void onStartTimeChanged(TimePoint startTime) {
+        //do nothing (onRaceStateChanged(RaceState) handles state change and fragment switch already
+    }
+
+    @Override
+    public void onRaceAborted() {
+        //do nothing (onRaceStateChanged(RaceState) handles state change and fragment switch already
+    }
+
     @Override
     public void onStartProcedureSpecificEvent(TimePoint eventTime, Integer eventId) {
         // TODO Auto-generated method stub

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/lists/ManagedRaceListFragment.java

@@ -55,7 +55,7 @@ public class ManagedRaceListFragment extends ListFragment implements JuryFlagCli
         // pass the localized string to the data elements...
         RaceListDataTypeElement.initializeTemplates(this);
 
-        adapter = new RaceListAdapter(getActivity(), R.layout.welter_two_row_no_image, raceDataTypeList, this);
+        adapter = new RaceListAdapter(getActivity(), raceDataTypeList, this);
         getListView().setChoiceMode(ListView.CHOICE_MODE_SINGLE);
         setListAdapter(adapter);
     }
@@ -63,35 +63,35 @@ public class ManagedRaceListFragment extends ListFragment implements JuryFlagCli
     @Override
     public void onStart() {
         super.onStart();
-        unregisterAllRaces();
-        registerAllRaces();
+        unregisterOnAllRaces();
+        registerOnAllRaces();
     }
 
     @Override
     public void onStop() {
-        unregisterAllRaces();
+        unregisterOnAllRaces();
         super.onStop();
     }
 
-    private void registerAllRaces() {
+    private void registerOnAllRaces() {
         for (ManagedRace managedRace : managedRacesById.values()) {
             managedRace.getState().registerListener(this);
         }
     }
 
-    private void unregisterAllRaces() {
+    private void unregisterOnAllRaces() {
         for (ManagedRace managedRace : managedRacesById.values()) {
             managedRace.getState().unregisterListener(this);
         }
     }
 
     public void setupOn(Collection<ManagedRace> listOfManagedRaces) {
-        unregisterAllRaces();
+        unregisterOnAllRaces();
         managedRacesById.clear();
         for (ManagedRace managedRace : listOfManagedRaces) {
             managedRacesById.put(managedRace.getId(), managedRace);
         }
-        registerAllRaces();
+        registerOnAllRaces();
 
         // initialize view
         initListElements(false);
@@ -100,11 +100,6 @@ public class ManagedRaceListFragment extends ListFragment implements JuryFlagCli
         notifyDataChanged();
     }
 
-    @Override
-    public void onRaceStateChanged(RaceState state) {
-        notifyDataChanged();
-    }
-
     private BoatClass getBoatClassForRace(ManagedRace managedRace) {
         if (managedRace.getRaceGroup().getBoatClass() == null) {
             return new BoatClassImpl(managedRace.getRaceGroup().getName(), false);
@@ -219,6 +214,11 @@ public class ManagedRaceListFragment extends ListFragment implements JuryFlagCli
         }
     }
 
+    @Override
+    public void onRaceStateChanged(RaceState state) {
+        notifyDataChanged();
+    }
+    
     @Override
     public void onStartTimeChanged(TimePoint startTime) {
         notifyDataChanged();
@@ -232,7 +232,6 @@ public class ManagedRaceListFragment extends ListFragment implements JuryFlagCli
     @Override
     public void onStartProcedureSpecificEvent(TimePoint eventTime, Integer eventId) {
         // TODO Auto-generated method stub
-        
     }
 
     /*