From 1076734ac9b6deee868056e832aa2c2e419d7f78 Mon Sep 17 00:00:00 2001 From: Alex Layton Date: Mon, 12 May 2014 13:25:22 -0400 Subject: [PATCH 1/4] Add `.mailmap` file --- .mailmap | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .mailmap 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 From febdd163576b0f3025a9b248afef1c15d45a5ea4 Mon Sep 17 00:00:00 2001 From: Alex Layton Date: Mon, 12 May 2014 13:41:42 -0400 Subject: [PATCH 2/4] Fix `.gitignore` --- .gitignore | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) 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 From 1df9de7c781f8bb5c00019551e0ac48387d0a976 Mon Sep 17 00:00:00 2001 From: Alex Layton Date: Mon, 12 May 2014 13:43:44 -0400 Subject: [PATCH 3/4] Update package name to an isoblue one --- AndroidManifest.xml | 4 ++-- src/edu/.DS_Store | Bin 6148 -> 0 bytes src/edu/purdue/.DS_Store | Bin 6148 -> 0 bytes .../purdue => org/isoblue}/isocomm/BTAgent.java | 2 +- .../isoblue}/isocomm/ColorMapper.java | 2 +- .../isoblue}/isocomm/DataGrabber.java | 2 +- .../isoblue}/isocomm/DeviceSelectDialog.java | 5 +++-- .../purdue => org/isoblue}/isocomm/GeoUtil.java | 2 +- .../purdue => org/isoblue}/isocomm/IRecord.java | 2 +- .../isoblue}/isocomm/LegendDialog.java | 3 ++- src/{edu/purdue => org/isoblue}/isocomm/Map.java | 8 ++++---- .../isoblue}/isocomm/SQLController.java | 2 +- 12 files changed, 17 insertions(+), 15 deletions(-) delete mode 100644 src/edu/.DS_Store delete mode 100644 src/edu/purdue/.DS_Store rename src/{edu/purdue => org/isoblue}/isocomm/BTAgent.java (99%) rename src/{edu/purdue => org/isoblue}/isocomm/ColorMapper.java (98%) rename src/{edu/purdue => org/isoblue}/isocomm/DataGrabber.java (99%) rename src/{edu/purdue => org/isoblue}/isocomm/DeviceSelectDialog.java (96%) rename src/{edu/purdue => org/isoblue}/isocomm/GeoUtil.java (98%) rename src/{edu/purdue => org/isoblue}/isocomm/IRecord.java (98%) rename src/{edu/purdue => org/isoblue}/isocomm/LegendDialog.java (98%) rename src/{edu/purdue => org/isoblue}/isocomm/Map.java (99%) rename src/{edu/purdue => org/isoblue}/isocomm/SQLController.java (99%) 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 5da1ffdfa5e9348bab8fb49c043cfdedaa027ce2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKNlz3(6n+m-rrl^27tm-c37W_Oa0>^+IO0N#0Ud&%=-5473>|yACfz+OB04u$ z4kljx0Y(!K9{mH}ym~R-z33k>@zpZGFzOAXre9L^y?R@9ebZev1pt^SyFCCV0Hml1 zY}!EGPek}dtCI$8X(mKjqYTWMiAs*oox146kT8%i@V7A_zTNduf-;2QQor*1{p6H< zFN(XnKVm~;)4KJ|DZ?-}8CzP68`&v7la1}T9A)hAx)=@H@sy+W5zhT3-F8MjHj^`3 z&+s6&y?})>*>f3%OkDK>m(OH)IdG$itTJBp+;~bB)dre2W#r7Z`T660eO=bk6TJ&v z)_hNI@9{3H?_|%yg8AG?wH-Rzf6?K0A3l2gyDkfcDJ?f+1tKve|yf{?%4U;g-|Tv4EK4M@yqOb zA@tmA$KXpNQzk7>rqQFqq^t<1~>!R1#s)C<`OPy8N*lzU?r7D9G?Q=EZS4 z4DF!6GIL{Io(Jm5TVz=p4u?#X?CAfdnCwVjtSX1KQgxZI9Hm?U9d(Lf;*!xA3G5>4 zNDr$hgU+2Ja2hVbDBOlS@C;tS8+Zrr;S+p?@7Rnc9>gPf3{T-XynvVS8s^c*B66I? zIlPAtRH26ITX3K{y+V9QSo0S6g`RAl7fZ_jwsW<=$Oi`8a-0YFaKCd=M%CmOx%*px zX=+7%>=p%T@~5+5;PaqB_UbdsN!Fs%6Qnk-Me(F&!a%~nKh1#HA1rDD(;6!Z<<>!+ zyaEt5ky#4qrcekijcJV)h2$YYl}e~mQC~4orIX##acPYeg(@9TUp`RJjQWOxa(1e3 z$#B55!lX|aNEoPPpivD?asHqE_5Hs#DH$aUBn1~NQM*M= rh={8wlquBd<5()pw diff --git a/src/edu/purdue/.DS_Store b/src/edu/purdue/.DS_Store deleted file mode 100644 index ce31f8f131d5a84cc07e97be5328c24e7bf7523a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%T5$Q6ulQvrV*tDe1JwQ$xx?%E14|0RMKI!GjnW*wj|OUuKbK z*(&*7ob>g5#D>PE4I7&?nx?gCTiUei`588sPt2qo=gjCDAB~#HjHUE3#{3oCw8lMm zuAq0GVqs!>p&N;0&v7Ya>WUXSY%a&jp%YK#rSXdABr~F@GSIXct)O=;EDR0}^%{qd z4lMQ>3;hEFgT2PkvHrzH{kfLuI&k>J1&iHXdidz^lc%p7R9dW$`VWS~qWL)3>&FbZ*k z&M&*yijn8!OQ!9G#fikdo#eecZb5Ia3BBw(H&#t!^CgPuTs4StXCv1QMZJ;f>DWys z3VK^?N6hy}S?nbq3n$ljC#PciInF0;a6X)7G~+DMKT_gh@wgksgmw87*L~A+{gE)o zl7t15W)zuW(ap_Ics2{=ledYoG#rgwUb5%JH_2sB_Ci%TsFbQpht(+Q0_dqzG#yur z+E{1?ZclbpMrm~R9DbM^d;SoHJXYd?e!mDVb zj{!2gjq`X9AIL%t)%Rdub$W@oL|F44_{ILb&4QAQc(K1eB4ESAPC2mwK2+|15^*&( z0_OZ7qBOH+7UV~8?Q_iLqtItzkv!F>7gPP6PL<4T`a9*)Dk%dg1M7$ZzCRe$IA#@A zB#Nzrx&|6@e-lS8q>GJ=&`{&7!iq%lkf2N@l&Pq$7%0=pZm77d!iq$h4k%`(I%;NA zHx#*zlHCyDfLV!YpE8g#@G}FAa;Wq3|Mc(g|34?Cqm+S^fpx_IHVx;8bF?INw$?3< ypS1?Ho7A}QxQaxPLY+E}g~E^Goz#So&)^DSR$)aVSxC}90)mFLOBwj54EzAZi~QFB 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 99% rename from src/edu/purdue/isocomm/DataGrabber.java rename to src/org/isoblue/isocomm/DataGrabber.java index a5fbe24..8e38723 100644 --- a/src/edu/purdue/isocomm/DataGrabber.java +++ b/src/org/isoblue/isocomm/DataGrabber.java @@ -25,7 +25,7 @@ * IN THE SOFTWARE. */ -package edu.purdue.isocomm; +package org.isoblue.isocomm; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/edu/purdue/isocomm/DeviceSelectDialog.java b/src/org/isoblue/isocomm/DeviceSelectDialog.java similarity index 96% rename from src/edu/purdue/isocomm/DeviceSelectDialog.java rename to src/org/isoblue/isocomm/DeviceSelectDialog.java index c8e3034..478074f 100644 --- a/src/edu/purdue/isocomm/DeviceSelectDialog.java +++ b/src/org/isoblue/isocomm/DeviceSelectDialog.java @@ -23,7 +23,7 @@ * IN THE SOFTWARE. */ -package edu.purdue.isocomm; +package org.isoblue.isocomm; import java.io.IOException; import java.util.ArrayList; @@ -41,6 +41,7 @@ import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.MarkerOptions; +import org.isoblue.isocomm.R; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; @@ -55,7 +56,7 @@ 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..d3c8826 100644 --- a/src/edu/purdue/isocomm/Map.java +++ b/src/org/isoblue/isocomm/Map.java @@ -23,12 +23,14 @@ * 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 org.isoblue.isocomm.DataGrabber; +import org.isoblue.isocomm.GeoUtil; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; @@ -53,9 +55,7 @@ import android.view.MenuItem; import android.view.Window; import android.widget.Toast; - -import edu.purdue.isocomm.DataGrabber; -import edu.purdue.isocomm.GeoUtil; +import org.isoblue.isocomm.R; 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; From a62d5a56dae1700abfc7536984e116506322c8df Mon Sep 17 00:00:00 2001 From: Alex Layton Date: Mon, 12 May 2014 13:45:30 -0400 Subject: [PATCH 4/4] Remove unused imports --- src/org/isoblue/isocomm/DataGrabber.java | 27 ------------------- .../isoblue/isocomm/DeviceSelectDialog.java | 17 ------------ src/org/isoblue/isocomm/Map.java | 25 ++++++++--------- 3 files changed, 11 insertions(+), 58 deletions(-) diff --git a/src/org/isoblue/isocomm/DataGrabber.java b/src/org/isoblue/isocomm/DataGrabber.java index 8e38723..2deb538 100644 --- a/src/org/isoblue/isocomm/DataGrabber.java +++ b/src/org/isoblue/isocomm/DataGrabber.java @@ -26,36 +26,9 @@ */ package org.isoblue.isocomm; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; 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/org/isoblue/isocomm/DeviceSelectDialog.java b/src/org/isoblue/isocomm/DeviceSelectDialog.java index 478074f..38d014e 100644 --- a/src/org/isoblue/isocomm/DeviceSelectDialog.java +++ b/src/org/isoblue/isocomm/DeviceSelectDialog.java @@ -25,23 +25,8 @@ 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 org.isoblue.isocomm.R; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; @@ -51,10 +36,8 @@ 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 org.isoblue.isocomm.NMEAUtil; diff --git a/src/org/isoblue/isocomm/Map.java b/src/org/isoblue/isocomm/Map.java index d3c8826..000bc57 100644 --- a/src/org/isoblue/isocomm/Map.java +++ b/src/org/isoblue/isocomm/Map.java @@ -29,20 +29,7 @@ import java.util.ArrayList; import org.isoblue.isobus.ISOBUSSocket; -import org.isoblue.isocomm.DataGrabber; -import org.isoblue.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; - -import android.os.Bundle; -import android.os.Handler; -import android.os.Message; import android.annotation.SuppressLint; import android.app.ActionBar; import android.app.Activity; @@ -50,12 +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 org.isoblue.isocomm.R; + +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;