Merge remote-tracking branch 'origin/master' into dataMining

java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java

@@ -45,7 +45,7 @@ import com.sap.sailing.domain.racelog.tracking.test.mock.MockSmartphoneImeiServi
 import com.sap.sailing.domain.racelog.tracking.test.mock.SmartphoneImeiIdentifier;
 import com.sap.sailing.domain.racelogtracking.DeviceIdentifier;
 import com.sap.sailing.domain.racelogtracking.RaceLogTrackingAdapter;
-import com.sap.sailing.domain.racelogtracking.impl.RaceLogTrackingAdapterFactoryImpl;
+import com.sap.sailing.domain.racelogtracking.RaceLogTrackingAdapterFactory;
 import com.sap.sailing.domain.tracking.Track;
 import com.sap.sailing.domain.tracking.TrackedRace;
 import com.sap.sailing.domain.tracking.impl.GPSFixMovingImpl;
@@ -82,7 +82,7 @@ public class CreateAndTrackWithRaceLogTest {
                 new HighPoint(), UUID.randomUUID(), /* useStartTimeInference */true);
         series.addRaceColumn(columnName, /* trackedRegattaRegistry */null);
         leaderboard = service.addRegattaLeaderboard(regatta.getRegattaIdentifier(), "RegattaLeaderboard", new int[] {});
-        adapter = RaceLogTrackingAdapterFactoryImpl.INSTANCE.getAdapter(DomainFactory.INSTANCE);
+        adapter = RaceLogTrackingAdapterFactory.INSTANCE.getAdapter(DomainFactory.INSTANCE);
     }
 
     @Test

java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/RaceLogTrackingAdapterFactory.java

@@ -1,7 +1,9 @@
 package com.sap.sailing.domain.racelogtracking;
 
 import com.sap.sailing.domain.base.DomainFactory;
+import com.sap.sailing.domain.racelogtracking.impl.RaceLogTrackingAdapterFactoryImpl;
 
 public interface RaceLogTrackingAdapterFactory {
+    RaceLogTrackingAdapterFactory INSTANCE = RaceLogTrackingAdapterFactoryImpl.INSTANCE;
     RaceLogTrackingAdapter getAdapter(DomainFactory baseDomainFactory);
 }

java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/Activator.java

@@ -69,7 +69,7 @@ public class Activator implements BundleActivator {
         registerGPSFixJsonService(context, new GPSFixNmeaDTOJsonDeserializer(), new GPSFixNmeaDTOJsonSerializer(), GPSFixNmeaDTOJsonDeserializer.TYPE);
         registerGPSFixJsonService(context, new GPSFixMovingNmeaDTOJsonDeserializer(), new GPSFixMovingNmeaDTOJsonSerializer(), GPSFixMovingNmeaDTOJsonDeserializer.TYPE);
         
-        registrations.add(context.registerService(RaceLogTrackingAdapterFactory.class, RaceLogTrackingAdapterFactoryImpl.INSTANCE, null));
+        registrations.add(context.registerService(RaceLogTrackingAdapterFactory.class, RaceLogTrackingAdapterFactory.INSTANCE, null));
         logger.log(Level.INFO, "Started "+context.getBundle().getSymbolicName());
     }
 

java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SailingServiceImplMock.java

@@ -21,7 +21,6 @@ import com.sap.sailing.domain.common.ScoreCorrectionProvider;
 import com.sap.sailing.domain.racelog.RaceLogStore;
 import com.sap.sailing.domain.racelog.tracking.test.mock.MockSmartphoneImeiServiceFinderFactory;
 import com.sap.sailing.domain.racelogtracking.RaceLogTrackingAdapterFactory;
-import com.sap.sailing.domain.racelogtracking.impl.RaceLogTrackingAdapterFactoryImpl;
 import com.sap.sailing.domain.regattalog.RegattaLogStore;
 import com.sap.sailing.domain.swisstimingadapter.StartList;
 import com.sap.sailing.domain.swisstimingadapter.SwissTimingAdapter;
@@ -175,7 +174,7 @@ public class SailingServiceImplMock extends SailingServiceImpl {
             BundleContext context) {
         @SuppressWarnings("unchecked")
         ServiceTracker<RaceLogTrackingAdapterFactory, RaceLogTrackingAdapterFactory> result = mock(ServiceTracker.class);
-        RaceLogTrackingAdapterFactory factory = RaceLogTrackingAdapterFactoryImpl.INSTANCE;
+        RaceLogTrackingAdapterFactory factory = RaceLogTrackingAdapterFactory.INSTANCE;
         when(result.getService()).thenReturn(factory);
         return result;
     }

mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/MessagePersistenceManager.java

@@ -163,7 +163,7 @@ public class MessagePersistenceManager {
             fileContent = FileHandlerUtils.convertStreamToString(inputStream, context);
             inputStream.close();
         } catch (IOException e) {
-            ExLog.w(context, TAG, "In Method getFileContent(): " + e.getMessage() + " fileContent is empty");
+            ExLog.w(context, TAG, "In Method getFileContent(): " + e.getClass().getName()+" / "+e.getMessage() + " fileContent is empty");
         }
         return fileContent;
     }

mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/MessageSendingService.java

@@ -109,7 +109,7 @@ public class MessageSendingService extends Service implements MessageSendingList
 
     private Date lastSuccessfulSend;
     
-    public List<String> getDelayedIntensContent() {
+    public List<String> getDelayedIntentsContent() {
         return persistenceManager.getContent();
     }
 

mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/SystemInformationActivityHelper.java

@@ -39,7 +39,7 @@ public class SystemInformationActivityHelper {
             
             waitingView.setAdapter(new ArrayAdapter<String>(activity, 
                     android.R.layout.simple_list_item_1, 
-                    activity.sendingService.getDelayedIntensContent()));
+                    activity.sendingService.getDelayedIntentsContent()));
         } else {
             statusView.setText(activity.getString(R.string.generic_error));
         }

mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java

@@ -108,20 +108,18 @@ public class LaunchActivity extends BaseActivity {
     }
     
     public void onToggleTrackingClicked(View view) {
-        if (!googlePLayServicesAvailable()) {
-            return;
-        }
-
-        if (! isTrackingActive){
+        if (googlePLayServicesAvailable()) {
+            if (!isTrackingActive) {
                 Intent startTrackingIntent = new Intent(this, TrackingService.class);
                 getBaseContext().startService(startTrackingIntent);
             } else {
                 Intent startTrackingIntent = new Intent(this, TrackingService.class);
                 getBaseContext().stopService(startTrackingIntent);
             }
-        isTrackingActive = ! isTrackingActive;
+            isTrackingActive = !isTrackingActive;
             updateToggleTrackingBtn();
         }
+    }
     
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {