Merge branch 'master' into bug1018

java/com.sap.sailing.server/src/com/sap/sailing/server/impl/PersistentCompetitorStore.java

@@ -97,9 +97,9 @@ public class PersistentCompetitorStore extends TransientCompetitorStoreImpl impl
 
     @Override
     public Competitor updateCompetitor(String idAsString, String newName, Color newRgbDisplayColor, String newEmail, String newSailId,
-            Nationality newNationality, URI newTeamImageUri) {
+            Nationality newNationality, URI newTeamImageUri, URI newFlagImageUri) {
         Competitor result = super.updateCompetitor(idAsString, newName, newRgbDisplayColor, newEmail, newSailId, newNationality,
-                newTeamImageUri);
+                newTeamImageUri, newFlagImageUri);
         storeTo.storeCompetitor(result);
         return result;
     }

java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java

@@ -478,7 +478,7 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes
             public void competitorUpdated(Competitor competitor) {
                 replicate(new UpdateCompetitor(competitor.getId().toString(), competitor.getName(), competitor
                         .getColor(), competitor.getEmail(), competitor.getBoat().getSailID(), competitor.getTeam().getNationality(),
-                        competitor.getTeam().getImage()));
+                        competitor.getTeam().getImage(), competitor.getFlagImage()));
             }
         });
         this.windStore = windStore;
@@ -2452,7 +2452,7 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes
         for (Competitor competitor : ((CompetitorStore) ois.readObject()).getCompetitors()) {
             DynamicCompetitor dynamicCompetitor = (DynamicCompetitor) competitor;
             competitorStore.getOrCreateCompetitor(dynamicCompetitor.getId(), dynamicCompetitor.getName(),
-                    dynamicCompetitor.getColor(), dynamicCompetitor.getEmail(), dynamicCompetitor.getTeam(), dynamicCompetitor.getBoat());
+                    dynamicCompetitor.getColor(), dynamicCompetitor.getEmail(), dynamicCompetitor.getFlagImage(), dynamicCompetitor.getTeam(), dynamicCompetitor.getBoat());
         }
         logoutput.append("Received " + competitorStore.size() + " NEW competitors\n");
 

java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/UpdateCompetitor.java

@@ -17,6 +17,7 @@ public class UpdateCompetitor extends AbstractRacingEventServiceOperation<Compet
     private final String newEmail;
     private final Nationality newNationality;
     private final URI newTeamImageUri;
+    private final URI newFlagImageUri;
     
     /**
      * @param idAsString
@@ -26,7 +27,7 @@ public class UpdateCompetitor extends AbstractRacingEventServiceOperation<Compet
      *            flag
      */
     public UpdateCompetitor(String idAsString, String newName, Color newDisplayColor, String newEmail, String newSailId,
-            Nationality newNationality, URI newTeamImageUri) {
+            Nationality newNationality, URI newTeamImageUri, URI newFlagImageUri) {
         super();
         this.idAsString = idAsString;
         this.newName = newName;
@@ -35,6 +36,7 @@ public class UpdateCompetitor extends AbstractRacingEventServiceOperation<Compet
         this.newNationality = newNationality;
         this.newTeamImageUri = newTeamImageUri;
         this.newEmail = newEmail;
+        this.newFlagImageUri = newFlagImageUri;
     }
 
     /**
@@ -49,7 +51,7 @@ public class UpdateCompetitor extends AbstractRacingEventServiceOperation<Compet
     public Competitor internalApplyTo(RacingEventService toState) throws Exception {
         Competitor result = toState.getBaseDomainFactory().getCompetitorStore()
                 .updateCompetitor(idAsString, newName, newDisplayColor, newEmail, newSailId, newNationality,
-                        newTeamImageUri);
+                        newTeamImageUri, newFlagImageUri);
         return result;
     }