Rename compass package to avoid conflict with other names named Compa…

…ss, fix up names
sybond · Aug 27, 2018 · 63d44c4 · 63d44c4
1 parent 8d7fe97
commit 63d44c4
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/src/androidTest/java/au/id/micolous/metrodroid/test/CompassTest.java b/src/androidTest/java/au/id/micolous/metrodroid/test/CompassTest.java
@@ -11,7 +11,7 @@
 import au.id.micolous.metrodroid.card.ultralight.UltralightCard;
 import au.id.micolous.metrodroid.card.ultralight.UltralightPage;
 import au.id.micolous.metrodroid.transit.TransitData;
-import au.id.micolous.metrodroid.transit.compass.CompassUltralightTransitData;
+import au.id.micolous.metrodroid.transit.yvr_compass.CompassUltralightTransitData;
 import au.id.micolous.metrodroid.util.Utils;
 
 /**

diff --git a/src/main/java/au/id/micolous/metrodroid/card/ultralight/UltralightCard.java b/src/main/java/au/id/micolous/metrodroid/card/ultralight/UltralightCard.java
@@ -33,7 +33,7 @@
 import au.id.micolous.metrodroid.fragment.UltralightCardRawDataFragment;
 import au.id.micolous.metrodroid.transit.TransitData;
 import au.id.micolous.metrodroid.transit.TransitIdentity;
-import au.id.micolous.metrodroid.transit.compass.CompassUltralightTransitData;
+import au.id.micolous.metrodroid.transit.yvr_compass.CompassUltralightTransitData;
 import au.id.micolous.metrodroid.transit.troika.TroikaUltralightTransitData;
 import au.id.micolous.metrodroid.transit.unknown.BlankUltralightTransitData;
 import au.id.micolous.metrodroid.transit.unknown.UnauthorizedUltralightTransitData;

diff --git a/src/main/java/au/id/micolous/metrodroid/transit/CardInfo.java b/src/main/java/au/id/micolous/metrodroid/transit/CardInfo.java
@@ -32,7 +32,7 @@
 import au.id.micolous.farebot.R;
 import au.id.micolous.metrodroid.card.CardType;
 import au.id.micolous.metrodroid.transit.chc_metrocard.ChcMetrocardTransitData;
-import au.id.micolous.metrodroid.transit.compass.CompassUltralightTransitData;
+import au.id.micolous.metrodroid.transit.yvr_compass.CompassUltralightTransitData;
 import au.id.micolous.metrodroid.transit.kmt.KMTTransitData;
 import au.id.micolous.metrodroid.transit.lax_tap.LaxTapTransitData;
 import au.id.micolous.metrodroid.transit.manly_fast_ferry.ManlyFastFerryTransitData;

diff --git a/...compass/CompassUltralightTransaction.java → ...compass/CompassUltralightTransaction.java b/...compass/CompassUltralightTransaction.java → ...compass/CompassUltralightTransaction.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package au.id.micolous.metrodroid.transit.compass;
+package au.id.micolous.metrodroid.transit.yvr_compass;
 
 import android.os.Parcel;
 import android.os.Parcelable;

diff --git a/...compass/CompassUltralightTransitData.java → ...compass/CompassUltralightTransitData.java b/...compass/CompassUltralightTransitData.java → ...compass/CompassUltralightTransitData.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package au.id.micolous.metrodroid.transit.compass;
+package au.id.micolous.metrodroid.transit.yvr_compass;
 
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -55,7 +55,7 @@ public CompassUltralightTransitData[] newArray(int size) {
             return new CompassUltralightTransitData[size];
         }
     };
-    public static final String NAME = "Compass Ultralight";
+    public static final String NAME = "Compass";
     private final int mProductCode;
     private final long mSerial;
     private final byte mType;

diff --git a/...ransit/compass/CompassUltralightTrip.java → ...it/yvr_compass/CompassUltralightTrip.java b/...ransit/compass/CompassUltralightTrip.java → ...it/yvr_compass/CompassUltralightTrip.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package au.id.micolous.metrodroid.transit.compass;
+package au.id.micolous.metrodroid.transit.yvr_compass;
 
 import android.os.Parcel;
 import android.os.Parcelable;