Move model objects into common source

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/model/Journey.java → code/Common/model/Journey.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.co.md87.android.contextanalyser.model;
+package uk.co.md87.android.common.model;
 
 import android.net.Uri;
 

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/model/JourneyStep.java → code/Common/model/JourneyStep.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.co.md87.android.contextanalyser.model;
+package uk.co.md87.android.common.model;
 
 import android.net.Uri;
 import uk.co.md87.android.contextanalyser.JourneysContentProvider;

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/model/Place.java → code/Common/model/Place.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.co.md87.android.contextanalyser.model;
+package uk.co.md87.android.common.model;
 
 import android.net.Uri;
 

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/ContextAnalyserService.java

@@ -49,9 +49,9 @@ import uk.co.md87.android.common.aggregator.AutoAggregator;
 import uk.co.md87.android.common.aggregator.AutoAggregatorFactory;
 import uk.co.md87.android.common.geo.LocationMonitor;
 import uk.co.md87.android.common.geo.LocationMonitorFactory;
-import uk.co.md87.android.contextanalyser.model.Journey;
-import uk.co.md87.android.contextanalyser.model.JourneyStep;
-import uk.co.md87.android.contextanalyser.model.Place;
+import uk.co.md87.android.common.model.Journey;
+import uk.co.md87.android.common.model.JourneyStep;
+import uk.co.md87.android.common.model.Place;
 
 /**
  * Background service which monitors and aggregates various sources of

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/DataHelper.java

@@ -36,9 +36,9 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import uk.co.md87.android.contextanalyser.model.Journey;
-import uk.co.md87.android.contextanalyser.model.JourneyStep;
-import uk.co.md87.android.contextanalyser.model.Place;
+import uk.co.md87.android.common.model.Journey;
+import uk.co.md87.android.common.model.JourneyStep;
+import uk.co.md87.android.common.model.Place;
 
 /**
  * Facilitates accessing the SQLite database used for storing places and

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/JourneyUtil.java

@@ -24,7 +24,7 @@ package uk.co.md87.android.contextanalyser;
 
 import java.util.LinkedList;
 import java.util.List;
-import uk.co.md87.android.contextanalyser.model.JourneyStep;
+import uk.co.md87.android.common.model.JourneyStep;
 
 /**
  * Provides utility methods relating to journeys.

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/JourneysContentProvider.java

@@ -29,8 +29,8 @@ import android.content.UriMatcher;
 import android.database.Cursor;
 import android.database.SQLException;
 import android.net.Uri;
-import uk.co.md87.android.contextanalyser.model.Journey;
-import uk.co.md87.android.contextanalyser.model.JourneyStep;
+import uk.co.md87.android.common.model.Journey;
+import uk.co.md87.android.common.model.JourneyStep;
 
 /**
  * A content provider for journeys and journey steps.

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/PlacesContentProvider.java

@@ -30,7 +30,7 @@ import android.database.Cursor;
 import android.database.SQLException;
 import android.net.Uri;
 
-import uk.co.md87.android.contextanalyser.model.Place;
+import uk.co.md87.android.common.model.Place;
 
 /**
  * A content provider for places.

code/ContextAnalyser/test/uk/co/md87/android/contextanalyser/JourneyUtilGetStepsTest.java

@@ -29,7 +29,7 @@ import org.junit.runners.Parameterized.Parameters;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import uk.co.md87.android.contextanalyser.model.JourneyStep;
+import uk.co.md87.android.common.model.JourneyStep;
 import static org.junit.Assert.*;
 
 /**

code/ContextAnalyser/test/uk/co/md87/android/contextanalyser/JourneyUtilIsCompatibleTest.java

@@ -29,7 +29,7 @@ import org.junit.runners.Parameterized.Parameters;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import uk.co.md87.android.contextanalyser.model.JourneyStep;
+import uk.co.md87.android.common.model.JourneyStep;
 import static org.junit.Assert.*;
 
 /**