Merge pull request #4 from awlayton/master

Post Transfer Polish
ISOBlue · May 12, 2014 · 5e73e24 · 5e73e24
2 parents 08f62dd + a62d5a5
commit 5e73e24
Show file tree

Hide file tree

Showing 14 changed files with 55 additions and 93 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,26 +1,25 @@
-+# built application files
- +*.apk
- +*.ap_
- +
- +# files for the dex VM
- +*.dex
- +
- +# Java class files
- +*.class
- +
- +# generated files
- +bin/
- +gen/
- +
- +# Local configuration file (sdk path, etc)
- +local.properties
- +
- +# Eclipse project files
- +.classpath
- +.project
- +.settings/
- +.externalToolBuilders/
- +
- +project.properties
- +
+# built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Eclipse project files
+.classpath
+.project
+.settings/
+.externalToolBuilders/
+
+project.properties
 
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,8 @@
+Pat S. Sabpisal <pat@uniduck.co> <ssabpisa@me.com>
+Alex Layton <alex@layton.in> <awlayton@purdue.edu>
+Joseph Watkins <watkin10@purdue.edu> <napkinsterror@gmail.com>
+Joseph Watkins <watkin10@purdue.edu> <watkin10@chives.ecn.purdue.edu>
+Aneesh Samudrala <asamudra@purdue.edu> <aneesh_samudrala@yahoo.com>
+Joseph Chiu <chiu12@purdue.edu> DMA-013 <apple@cary-f-116.resnet.purdue.edu>
+Joseph Chiu <chiu12@purdue.edu> DMA-013 <apple@pal-nat184-220-205.itap.purdue.edu>
+Joseph Chiu <chiu12@purdue.edu> DMA-013 <apple@pal-nat184-220-208.itap.purdue.edu>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="edu.purdue.isocomm"
+    package="org.isoblue.isocomm"
     android:versionCode="1"
     android:versionName="1.0" >
 
@@ -30,7 +30,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name="edu.purdue.isocomm.Map"
+            android:name="org.isoblue.isocomm.Map"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/src/edu/.DS_Store b/src/edu/.DS_Store
diff --git a/src/edu/purdue/.DS_Store b/src/edu/purdue/.DS_Store
diff --git a/src/edu/purdue/isocomm/BTAgent.java → src/org/isoblue/isocomm/BTAgent.java b/src/edu/purdue/isocomm/BTAgent.java → src/org/isoblue/isocomm/BTAgent.java
@@ -23,7 +23,7 @@
  * IN THE SOFTWARE.
  */
 
-package edu.purdue.isocomm;
+package org.isoblue.isocomm;
 
 import java.io.IOException;
 import java.io.Serializable;

diff --git a/src/edu/purdue/isocomm/ColorMapper.java → src/org/isoblue/isocomm/ColorMapper.java b/src/edu/purdue/isocomm/ColorMapper.java → src/org/isoblue/isocomm/ColorMapper.java
@@ -23,7 +23,7 @@
  * IN THE SOFTWARE.
  */
 
-package edu.purdue.isocomm;
+package org.isoblue.isocomm;
 
 import android.graphics.Color;
 

diff --git a/src/edu/purdue/isocomm/DataGrabber.java → src/org/isoblue/isocomm/DataGrabber.java b/src/edu/purdue/isocomm/DataGrabber.java → src/org/isoblue/isocomm/DataGrabber.java
@@ -25,37 +25,10 @@
  * IN THE SOFTWARE.
  */
 
-package edu.purdue.isocomm;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+package org.isoblue.isocomm;
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 
-import org.isoblue.isoblue.ISOBlueDevice;
-import org.isoblue.isobus.ISOBUSSocket;
-
-import com.google.android.gms.maps.CameraUpdateFactory;
-import com.google.android.gms.maps.GoogleMap;
-import com.google.android.gms.maps.MapFragment;
 import com.google.android.gms.maps.model.LatLng;
-import com.google.android.gms.maps.model.MarkerOptions;
-import com.google.android.gms.maps.model.Polygon;
-import com.google.android.gms.maps.model.PolygonOptions;
-
-import android.R.menu;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.bluetooth.BluetoothDevice;
-import android.graphics.Color;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.Toast;
 
 public class DataGrabber {
 

diff --git a/...du/purdue/isocomm/DeviceSelectDialog.java → ...g/isoblue/isocomm/DeviceSelectDialog.java b/...du/purdue/isocomm/DeviceSelectDialog.java → ...g/isoblue/isocomm/DeviceSelectDialog.java
@@ -23,23 +23,9 @@
  * IN THE SOFTWARE.
  */
 
-package edu.purdue.isocomm;
+package org.isoblue.isocomm;
 
-import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.isoblue.isoblue.ISOBlueDevice;
-import org.isoblue.isobus.ISOBUSSocket;
-import org.isoblue.isobus.Message;
-import org.isoblue.isobus.PGN;
-import org.isoblue.isobus.PGN.InvalidPGNException;
-
-import com.google.android.gms.maps.GoogleMap;
-import com.google.android.gms.maps.MapFragment;
-import com.google.android.gms.maps.model.LatLng;
-import com.google.android.gms.maps.model.MarkerOptions;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -50,12 +36,10 @@
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Handler;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.Toast;
 
-//import edu.purdue.isocomm.NMEAUtil;
+//import org.isoblue.isocomm.NMEAUtil;
 
 public class DeviceSelectDialog extends DialogFragment {
 	public CharSequence[] items = null;

diff --git a/src/edu/purdue/isocomm/GeoUtil.java → src/org/isoblue/isocomm/GeoUtil.java b/src/edu/purdue/isocomm/GeoUtil.java → src/org/isoblue/isocomm/GeoUtil.java
@@ -23,7 +23,7 @@
  * IN THE SOFTWARE.
  */
 
-package edu.purdue.isocomm;
+package org.isoblue.isocomm;
 
 import android.graphics.Point;
 

diff --git a/src/edu/purdue/isocomm/IRecord.java → src/org/isoblue/isocomm/IRecord.java b/src/edu/purdue/isocomm/IRecord.java → src/org/isoblue/isocomm/IRecord.java
@@ -23,7 +23,7 @@
  * IN THE SOFTWARE.
  */
 
-package edu.purdue.isocomm;
+package org.isoblue.isocomm;
 
 public class IRecord {
 	public int PGN;

diff --git a/src/edu/purdue/isocomm/LegendDialog.java → src/org/isoblue/isocomm/LegendDialog.java b/src/edu/purdue/isocomm/LegendDialog.java → src/org/isoblue/isocomm/LegendDialog.java
@@ -23,8 +23,9 @@
  * IN THE SOFTWARE.
  */
 
-package edu.purdue.isocomm;
+package org.isoblue.isocomm;
 
+import org.isoblue.isocomm.R;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;

diff --git a/src/edu/purdue/isocomm/Map.java → src/org/isoblue/isocomm/Map.java b/src/edu/purdue/isocomm/Map.java → src/org/isoblue/isocomm/Map.java
@@ -23,39 +23,36 @@
  * IN THE SOFTWARE.
  */
 
-package edu.purdue.isocomm;
+package org.isoblue.isocomm;
 
 import java.io.IOException;
 import java.util.ArrayList;
 
 import org.isoblue.isobus.ISOBUSSocket;
 
-import com.google.android.gms.maps.CameraUpdateFactory;
-import com.google.android.gms.maps.GoogleMap;
-import com.google.android.gms.maps.MapFragment;
-import com.google.android.gms.maps.model.LatLng;
-import com.google.android.gms.maps.model.Marker;
-import com.google.android.gms.maps.model.Polyline;
-import com.google.android.gms.maps.model.PolylineOptions;
-
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.annotation.SuppressLint;
 import android.app.ActionBar;
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.bluetooth.BluetoothDevice;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.Window;
 import android.widget.Toast;
 
-import edu.purdue.isocomm.DataGrabber;
-import edu.purdue.isocomm.GeoUtil;
+import com.google.android.gms.maps.CameraUpdateFactory;
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.MapFragment;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.Marker;
+import com.google.android.gms.maps.model.Polyline;
+import com.google.android.gms.maps.model.PolylineOptions;
 
 public class Map extends Activity {
 	private GoogleMap mMap;

diff --git a/src/edu/purdue/isocomm/SQLController.java → src/org/isoblue/isocomm/SQLController.java b/src/edu/purdue/isocomm/SQLController.java → src/org/isoblue/isocomm/SQLController.java
@@ -24,7 +24,7 @@
  * IN THE SOFTWARE.
  */
 
-package edu.purdue.isocomm;
+package org.isoblue.isocomm;
 
 import java.util.ArrayList;