diff --git a/.gitignore b/.gitignore index 55c5bf7..19f690d 100644 --- 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 new file mode 100644 index 0000000..5a2632c --- /dev/null +++ b/.mailmap @@ -0,0 +1,8 @@ +Pat S. Sabpisal +Alex Layton +Joseph Watkins +Joseph Watkins +Aneesh Samudrala +Joseph Chiu DMA-013 +Joseph Chiu DMA-013 +Joseph Chiu DMA-013 diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 79f7f28..5c624b3 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -30,7 +30,7 @@ android:label="@string/app_name" android:theme="@style/AppTheme" > diff --git a/src/edu/.DS_Store b/src/edu/.DS_Store deleted file mode 100644 index 5da1ffd..0000000 Binary files a/src/edu/.DS_Store and /dev/null differ diff --git a/src/edu/purdue/.DS_Store b/src/edu/purdue/.DS_Store deleted file mode 100644 index ce31f8f..0000000 Binary files a/src/edu/purdue/.DS_Store and /dev/null differ diff --git a/src/edu/purdue/isocomm/BTAgent.java b/src/org/isoblue/isocomm/BTAgent.java similarity index 99% rename from src/edu/purdue/isocomm/BTAgent.java rename to src/org/isoblue/isocomm/BTAgent.java index 31d7beb..898105d 100644 --- a/src/edu/purdue/isocomm/BTAgent.java +++ b/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 b/src/org/isoblue/isocomm/ColorMapper.java similarity index 98% rename from src/edu/purdue/isocomm/ColorMapper.java rename to src/org/isoblue/isocomm/ColorMapper.java index 99bdcc3..6e341d7 100644 --- a/src/edu/purdue/isocomm/ColorMapper.java +++ b/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 b/src/org/isoblue/isocomm/DataGrabber.java similarity index 86% rename from src/edu/purdue/isocomm/DataGrabber.java rename to src/org/isoblue/isocomm/DataGrabber.java index a5fbe24..2deb538 100644 --- a/src/edu/purdue/isocomm/DataGrabber.java +++ b/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/src/edu/purdue/isocomm/DeviceSelectDialog.java b/src/org/isoblue/isocomm/DeviceSelectDialog.java similarity index 81% rename from src/edu/purdue/isocomm/DeviceSelectDialog.java rename to src/org/isoblue/isocomm/DeviceSelectDialog.java index c8e3034..38d014e 100644 --- a/src/edu/purdue/isocomm/DeviceSelectDialog.java +++ b/src/org/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 b/src/org/isoblue/isocomm/GeoUtil.java similarity index 98% rename from src/edu/purdue/isocomm/GeoUtil.java rename to src/org/isoblue/isocomm/GeoUtil.java index 36dd3fa..0b884e9 100644 --- a/src/edu/purdue/isocomm/GeoUtil.java +++ b/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 b/src/org/isoblue/isocomm/IRecord.java similarity index 98% rename from src/edu/purdue/isocomm/IRecord.java rename to src/org/isoblue/isocomm/IRecord.java index 7d59a95..0b1961a 100644 --- a/src/edu/purdue/isocomm/IRecord.java +++ b/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 b/src/org/isoblue/isocomm/LegendDialog.java similarity index 98% rename from src/edu/purdue/isocomm/LegendDialog.java rename to src/org/isoblue/isocomm/LegendDialog.java index 101187d..786b62d 100644 --- a/src/edu/purdue/isocomm/LegendDialog.java +++ b/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 b/src/org/isoblue/isocomm/Map.java similarity index 99% rename from src/edu/purdue/isocomm/Map.java rename to src/org/isoblue/isocomm/Map.java index 3419825..000bc57 100644 --- a/src/edu/purdue/isocomm/Map.java +++ b/src/org/isoblue/isocomm/Map.java @@ -23,24 +23,13 @@ * 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; @@ -48,14 +37,22 @@ 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 b/src/org/isoblue/isocomm/SQLController.java similarity index 99% rename from src/edu/purdue/isocomm/SQLController.java rename to src/org/isoblue/isocomm/SQLController.java index 566dd5e..89fcdc9 100644 --- a/src/edu/purdue/isocomm/SQLController.java +++ b/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;