Use a proper model for classifications

Now merges adjacent duplicates into one another. Closes #55

code/ActivityRecorder/src/uk/co/md87/android/activityrecorder/ActivityRecorderActivity.java

@@ -22,8 +22,8 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ListView;
 import android.widget.Toast;
-import java.util.Map;
 import uk.co.md87.android.activityrecorder.rpc.ActivityRecorderBinder;
+import uk.co.md87.android.activityrecorder.rpc.Classification;
 import uk.co.md87.android.common.ExceptionHandler;
 
 /**
@@ -93,7 +93,7 @@ public class ActivityRecorderActivity extends Activity {
         ((Button) findViewById(R.id.togglebutton)).setEnabled(false);
         ((Button) findViewById(R.id.togglebutton)).setOnClickListener(clickListener);
         ((ListView) findViewById(R.id.list)).setAdapter(
-                new ArrayAdapter<Map.Entry<Long, String>>(this, R.layout.item));
+                new ArrayAdapter<Classification>(this, R.layout.item));
     }
 
     /** {@inheritDoc} */
@@ -112,11 +112,10 @@ public class ActivityRecorderActivity extends Activity {
             ((Button) findViewById(R.id.togglebutton)).setEnabled(true);
             
             // Hacky
-            ((ArrayAdapter<Map.Entry<Long, String>>) ((ListView) findViewById(R.id.list))
+            ((ArrayAdapter<Classification>) ((ListView) findViewById(R.id.list))
                     .getAdapter()).clear();
-            for (Map.Entry<Long, String> entry : ((Map<Long, String>) service
-                    .getClassifications()).entrySet()) {
-                ((ArrayAdapter<Map.Entry<Long, String>>) ((ListView) findViewById(R.id.list))
+            for (Classification entry : service.getClassifications()) {
+                ((ArrayAdapter<Classification>) ((ListView) findViewById(R.id.list))
                     .getAdapter()).add(entry);
             }
         } catch (RemoteException ex) {

code/ActivityRecorder/src/uk/co/md87/android/activityrecorder/RecorderService.java

@@ -20,10 +20,12 @@ import android.util.Log;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
-import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import uk.co.md87.android.activityrecorder.rpc.ActivityRecorderBinder;
+import uk.co.md87.android.activityrecorder.rpc.Classification;
 
 /**
  *
@@ -35,10 +37,16 @@ public class RecorderService extends Service {
 
         public void submitClassification(String classification) throws RemoteException {
             Log.i(getClass().getName(), "Adding classification: " + classification);
-            classifications.put(System.currentTimeMillis(), classification);
+
+            if (!classifications.isEmpty() && classification.equals(classifications
+                    .get(classifications.size() - 1).getClassification())) {
+                classifications.get(classifications.size() - 1).updateEnd(System.currentTimeMillis());
+            } else {
+                classifications.add(new Classification(classification, System.currentTimeMillis()));
+            }
         }
 
-        public Map getClassifications() throws RemoteException {
+        public List<Classification> getClassifications() throws RemoteException {
             return classifications;
         }
 
@@ -75,7 +83,7 @@ public class RecorderService extends Service {
 
     boolean running;
     public static Map<Float[], String> model;
-    private final Map<Long, String> classifications = new HashMap<Long, String>();
+    private final List<Classification> classifications = new ArrayList<Classification>();
 
     private final SensorEventListener accelListener = new SensorEventListener() {
 

code/ActivityRecorder/src/uk/co/md87/android/activityrecorder/rpc/ActivityRecorderBinder.aidl

@@ -5,6 +5,8 @@
 
 package uk.co.md87.android.activityrecorder.rpc;
 
+import uk.co.md87.android.activityrecorder.rpc.Classification;
+
 /**
  *
  * @author chris
@@ -15,6 +17,6 @@ interface ActivityRecorderBinder {
 
     void submitClassification(String classification);
 
-    Map getClassifications();
+    List<Classification> getClassifications();
 
 }

code/ActivityRecorder/src/uk/co/md87/android/activityrecorder/rpc/ActivityRecorderBinder.java

@@ -1,15 +1,15 @@
 /*
  * This file is auto-generated.  DO NOT MODIFY.
- * Original file: src/uk/co/md87/android/activityrecorder/rpc/ActivityRecorderBinder.aidl
+ * Original file: uk/co/md87/android/activityrecorder/rpc/ActivityRecorderBinder.aidl
  */
 package uk.co.md87.android.activityrecorder.rpc;
 import java.lang.String;
-import java.util.Map;
 import android.os.RemoteException;
 import android.os.IBinder;
 import android.os.IInterface;
 import android.os.Binder;
 import android.os.Parcel;
+import java.util.List;
 /**
  *
  * @author chris
@@ -73,9 +73,9 @@ return true;
 case TRANSACTION_getClassifications:
 {
 data.enforceInterface(DESCRIPTOR);
-java.util.Map _result = this.getClassifications();
+java.util.List<uk.co.md87.android.activityrecorder.rpc.Classification> _result = this.getClassifications();
 reply.writeNoException();
-reply.writeMap(_result);
+reply.writeTypedList(_result);
 return true;
 }
 }
@@ -128,17 +128,16 @@ _reply.recycle();
 _data.recycle();
 }
 }
-public java.util.Map getClassifications() throws android.os.RemoteException
+public java.util.List<uk.co.md87.android.activityrecorder.rpc.Classification> getClassifications() throws android.os.RemoteException
 {
 android.os.Parcel _data = android.os.Parcel.obtain();
 android.os.Parcel _reply = android.os.Parcel.obtain();
-java.util.Map _result;
+java.util.List<uk.co.md87.android.activityrecorder.rpc.Classification> _result;
 try {
 _data.writeInterfaceToken(DESCRIPTOR);
 mRemote.transact(Stub.TRANSACTION_getClassifications, _data, _reply, 0);
 _reply.readException();
-java.lang.ClassLoader cl = (java.lang.ClassLoader)this.getClass().getClassLoader();
-_result = _reply.readHashMap(cl);
+_result = _reply.createTypedArrayList(uk.co.md87.android.activityrecorder.rpc.Classification.CREATOR);
 }
 finally {
 _reply.recycle();
@@ -153,5 +152,5 @@ static final int TRANSACTION_getClassifications = (IBinder.FIRST_CALL_TRANSACTIO
 }
 public boolean isRunning() throws android.os.RemoteException;
 public void submitClassification(java.lang.String classification) throws android.os.RemoteException;
-public java.util.Map getClassifications() throws android.os.RemoteException;
+public java.util.List<uk.co.md87.android.activityrecorder.rpc.Classification> getClassifications() throws android.os.RemoteException;
 }

code/ActivityRecorder/src/uk/co/md87/android/activityrecorder/rpc/Classification.aidl

@@ -0,0 +1,3 @@
+package uk.co.md87.android.activityrecorder.rpc;
+
+parcelable Classification;

code/ActivityRecorder/src/uk/co/md87/android/activityrecorder/rpc/Classification.java

@@ -0,0 +1,73 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package uk.co.md87.android.activityrecorder.rpc;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ *
+ * @author chris
+ */
+public class Classification implements Parcelable {
+
+    private final String classification;
+    private final long start;
+    private long end;
+
+    public Classification(final String classification, final long start) {
+        this.classification = classification;
+        this.start = start;
+        this.end = start;
+    }
+
+    public void updateEnd(final long end) {
+        this.end = end;
+    }
+
+    public int describeContents() {
+        return 0;
+    }
+
+    public String getClassification() {
+        return classification;
+    }
+
+    public long getEnd() {
+        return end;
+    }
+
+    public long getStart() {
+        return start;
+    }
+
+    @Override
+    public String toString() {
+        return classification + "\n" + start + " -- " + (end - start);
+    }
+
+    public void writeToParcel(Parcel arg0, int arg1) {
+        arg0.writeString(classification);
+        arg0.writeLong(start);
+        arg0.writeLong(end);
+    }
+
+    public static final Parcelable.Creator<Classification> CREATOR
+             = new Parcelable.Creator<Classification>() {
+
+        public Classification createFromParcel(Parcel arg0) {
+            final Classification res = new Classification(arg0.readString(), arg0.readLong());
+            res.updateEnd(arg0.readLong());
+            return res;
+        }
+
+        public Classification[] newArray(int arg0) {
+            return new Classification[arg0];
+        }
+
+    };
+
+}