diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 810797e4..5ee5fba8 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -17,15 +17,15 @@ - + - - + + \ No newline at end of file diff --git a/gen/de/sfb/tilemap/BuildConfig.java b/gen/org/mapsforge/tilemap/BuildConfig.java similarity index 80% rename from gen/de/sfb/tilemap/BuildConfig.java rename to gen/org/mapsforge/tilemap/BuildConfig.java index df63e523..12dc954d 100644 --- a/gen/de/sfb/tilemap/BuildConfig.java +++ b/gen/org/mapsforge/tilemap/BuildConfig.java @@ -1,5 +1,5 @@ /** Automatically generated file. DO NOT MODIFY */ -package de.sfb.tilemap; +package org.mapsforge.tilemap; public final class BuildConfig { public final static boolean DEBUG = true; diff --git a/gen/de/sfb/tilemap/R.java b/gen/org/mapsforge/tilemap/R.java similarity index 99% rename from gen/de/sfb/tilemap/R.java rename to gen/org/mapsforge/tilemap/R.java index 5d15fbd9..cf3b7be3 100644 --- a/gen/de/sfb/tilemap/R.java +++ b/gen/org/mapsforge/tilemap/R.java @@ -5,7 +5,7 @@ * should not be modified by hand. */ -package de.sfb.tilemap; +package org.mapsforge.tilemap; public final class R { public static final class array { diff --git a/src/org/mapsforge/android/MapView.java b/src/org/mapsforge/android/MapView.java index 53f35369..89fb573f 100644 --- a/src/org/mapsforge/android/MapView.java +++ b/src/org/mapsforge/android/MapView.java @@ -17,9 +17,7 @@ package org.mapsforge.android; import java.io.File; import java.io.FileNotFoundException; -import org.mapsforge.android.inputhandling.MapMover; import org.mapsforge.android.inputhandling.TouchHandler; -import org.mapsforge.android.inputhandling.ZoomAnimator; import org.mapsforge.android.mapgenerator.JobParameters; import org.mapsforge.android.mapgenerator.JobQueue; import org.mapsforge.android.mapgenerator.JobTheme; @@ -33,15 +31,14 @@ import org.mapsforge.android.rendertheme.InternalRenderTheme; import org.mapsforge.android.utils.GlConfigChooser; import org.mapsforge.core.GeoPoint; import org.mapsforge.core.MapPosition; -import org.mapsforge.mapdatabase.FileOpenResult; -import org.mapsforge.mapdatabase.IMapDatabase; -import org.mapsforge.mapdatabase.mapfile.MapDatabase; +import org.mapsforge.database.FileOpenResult; +import org.mapsforge.database.IMapDatabase; +import org.mapsforge.database.mapfile.MapDatabase; import android.content.Context; import android.opengl.GLSurfaceView; import android.util.AttributeSet; import android.util.Log; -import android.view.KeyEvent; import android.view.MotionEvent; /** @@ -70,14 +67,15 @@ public class MapView extends GLSurfaceView { private static final float DEFAULT_TEXT_SCALE = 1; private final MapController mMapController; - private final MapMover mMapMover; + // private final MapMover mMapMover; + // private final ZoomAnimator mZoomAnimator; + private final MapScaleBar mMapScaleBar; private final MapViewPosition mMapViewPosition; private final MapZoomControls mMapZoomControls; private final Projection mProjection; private final TouchHandler mTouchEventHandler; - private final ZoomAnimator mZoomAnimator; private IMapDatabase mMapDatabase; private MapGenerator mMapGenerator; @@ -151,10 +149,10 @@ public class MapView extends GLSurfaceView { mJobQueue = new JobQueue(this); mMapWorker = new MapWorker(this); mMapWorker.start(); - mMapMover = new MapMover(this); - mMapMover.start(); - mZoomAnimator = new ZoomAnimator(this); - mZoomAnimator.start(); + // mMapMover = new MapMover(this); + // mMapMover.start(); + // mZoomAnimator = new ZoomAnimator(this); + // mZoomAnimator.start(); setMapGeneratorInternal(mapGenerator); @@ -232,12 +230,12 @@ public class MapView extends GLSurfaceView { return mMapGenerator; } - /** - * @return the MapMover which is used by this MapView. - */ - public MapMover getMapMover() { - return mMapMover; - } + // /** + // * @return the MapMover which is used by this MapView. + // */ + // public MapMover getMapMover() { + // return mMapMover; + // } /** * @return the current position and zoom level of this MapView. @@ -267,32 +265,32 @@ public class MapView extends GLSurfaceView { return mProjection; } - /** - * @return true if the ZoomAnimator is currently running, false otherwise. - */ - public boolean isZoomAnimatorRunning() { - return mZoomAnimator.isExecuting(); - } + // /** + // * @return true if the ZoomAnimator is currently running, false otherwise. + // */ + // public boolean isZoomAnimatorRunning() { + // return mZoomAnimator.isExecuting(); + // } - @Override - public boolean onKeyDown(int keyCode, KeyEvent keyEvent) { - return mMapMover.onKeyDown(keyCode, keyEvent); - } - - @Override - public boolean onKeyUp(int keyCode, KeyEvent keyEvent) { - return mMapMover.onKeyUp(keyCode, keyEvent); - } + // @Override + // public boolean onKeyDown(int keyCode, KeyEvent keyEvent) { + // return mMapMover.onKeyDown(keyCode, keyEvent); + // } + // + // @Override + // public boolean onKeyUp(int keyCode, KeyEvent keyEvent) { + // return mMapMover.onKeyUp(keyCode, keyEvent); + // } @Override public boolean onTouchEvent(MotionEvent motionEvent) { return mTouchEventHandler.handleMotionEvent(motionEvent); } - @Override - public boolean onTrackballEvent(MotionEvent motionEvent) { - return mMapMover.onTrackballEvent(motionEvent); - } + // @Override + // public boolean onTrackballEvent(MotionEvent motionEvent) { + // return mMapMover.onTrackballEvent(motionEvent); + // } /** * Calculates all necessary tiles and adds jobs accordingly. @@ -365,17 +363,16 @@ public class MapView extends GLSurfaceView { return false; } - mZoomAnimator.pause(); + // mZoomAnimator.pause(); + // mMapMover.pause(); mMapWorker.pause(); - mMapMover.pause(); - mZoomAnimator.awaitPausing(); - mMapMover.awaitPausing(); + // mZoomAnimator.awaitPausing(); + // mMapMover.awaitPausing(); mMapWorker.awaitPausing(); - mMapMover.stopMove(); - - mZoomAnimator.proceed(); + // mZoomAnimator.proceed(); + // mMapMover.stopMove(); + // mMapMover.proceed(); mMapWorker.proceed(); - mMapMover.proceed(); mMapDatabase.closeFile(); FileOpenResult fileOpenResult = mMapDatabase.openFile(new File(mapFile)); @@ -588,9 +585,9 @@ public class MapView extends GLSurfaceView { } void destroy() { - mMapMover.interrupt(); + // mMapMover.interrupt(); mMapWorker.interrupt(); - mZoomAnimator.interrupt(); + // mZoomAnimator.interrupt(); try { mMapWorker.join(); @@ -617,10 +614,9 @@ public class MapView extends GLSurfaceView { boolean hasValidCenter() { if (!mMapViewPosition.isValid()) { return false; - } else if (!mMapGenerator.requiresInternetConnection() && - (!mMapDatabase.hasOpenFile() || - !mMapDatabase.getMapFileInfo().boundingBox - .contains(getMapPosition().getMapCenter()))) { + } else if (!mMapGenerator.requiresInternetConnection() + && (!mMapDatabase.hasOpenFile() || !mMapDatabase.getMapFileInfo().boundingBox.contains(getMapPosition() + .getMapCenter()))) { return false; } @@ -635,16 +631,16 @@ public class MapView extends GLSurfaceView { public void onPause() { super.onPause(); mMapWorker.pause(); - mMapMover.pause(); - mZoomAnimator.pause(); + // mMapMover.pause(); + // mZoomAnimator.pause(); } @Override public void onResume() { super.onResume(); mMapWorker.proceed(); - mMapMover.proceed(); - mZoomAnimator.proceed(); + // mMapMover.proceed(); + // mZoomAnimator.proceed(); } /** diff --git a/src/org/mapsforge/android/glrenderer/DatabaseRenderer.java b/src/org/mapsforge/android/glrenderer/DatabaseRenderer.java index c17ac389..4fbfb397 100644 --- a/src/org/mapsforge/android/glrenderer/DatabaseRenderer.java +++ b/src/org/mapsforge/android/glrenderer/DatabaseRenderer.java @@ -33,9 +33,9 @@ import org.mapsforge.core.GeoPoint; import org.mapsforge.core.SphericalMercator; import org.mapsforge.core.Tag; import org.mapsforge.core.Tile; -import org.mapsforge.mapdatabase.IMapDatabase; -import org.mapsforge.mapdatabase.IMapDatabaseCallback; -import org.mapsforge.mapdatabase.MapFileInfo; +import org.mapsforge.database.IMapDatabase; +import org.mapsforge.database.IMapDatabaseCallback; +import org.mapsforge.database.MapFileInfo; import org.xml.sax.SAXException; import android.graphics.Bitmap; diff --git a/src/org/mapsforge/android/mapgenerator/MapDatabaseFactory.java b/src/org/mapsforge/android/mapgenerator/MapDatabaseFactory.java index 9ea103cb..e34a95c8 100644 --- a/src/org/mapsforge/android/mapgenerator/MapDatabaseFactory.java +++ b/src/org/mapsforge/android/mapgenerator/MapDatabaseFactory.java @@ -14,7 +14,7 @@ */ package org.mapsforge.android.mapgenerator; -import org.mapsforge.mapdatabase.IMapDatabase; +import org.mapsforge.database.IMapDatabase; import android.util.AttributeSet; @@ -33,7 +33,7 @@ public final class MapDatabaseFactory { public static IMapDatabase createMapDatabase(AttributeSet attributeSet) { String mapDatabaseName = attributeSet.getAttributeValue(null, MAP_DATABASE_ATTRIBUTE_NAME); if (mapDatabaseName == null) { - return new org.mapsforge.mapdatabase.mapfile.MapDatabase(); + return new org.mapsforge.database.mapfile.MapDatabase(); } MapDatabaseInternal mapDatabaseInternal = MapDatabaseInternal.valueOf(mapDatabaseName); @@ -48,11 +48,11 @@ public final class MapDatabaseFactory { public static IMapDatabase createMapDatabase(MapDatabaseInternal mapDatabaseInternal) { switch (mapDatabaseInternal) { case MAP_READER: - return new org.mapsforge.mapdatabase.mapfile.MapDatabase(); + return new org.mapsforge.database.mapfile.MapDatabase(); case JSON_READER: - return new org.mapsforge.mapdatabase.json.MapDatabase(); + return new org.mapsforge.database.json.MapDatabase(); case POSTGIS_READER: - return new org.mapsforge.mapdatabase.postgis.MapDatabase(); + return new org.mapsforge.database.postgis.MapDatabase(); } diff --git a/src/org/mapsforge/android/mapgenerator/MapGenerator.java b/src/org/mapsforge/android/mapgenerator/MapGenerator.java index 50386f16..0524f9d0 100644 --- a/src/org/mapsforge/android/mapgenerator/MapGenerator.java +++ b/src/org/mapsforge/android/mapgenerator/MapGenerator.java @@ -17,7 +17,7 @@ package org.mapsforge.android.mapgenerator; import org.mapsforge.android.MapRenderer; import org.mapsforge.android.MapView; import org.mapsforge.core.GeoPoint; -import org.mapsforge.mapdatabase.IMapDatabase; +import org.mapsforge.database.IMapDatabase; /** * A MapGenerator provides map tiles either by downloading or rendering them. diff --git a/src/org/mapsforge/android/rendertheme/osmarender/osmarender.xml b/src/org/mapsforge/android/rendertheme/osmarender/osmarender.xml index ab359708..8b092ac7 100644 --- a/src/org/mapsforge/android/rendertheme/osmarender/osmarender.xml +++ b/src/org/mapsforge/android/rendertheme/osmarender/osmarender.xml @@ -385,7 +385,7 @@ stroke-linecap="butt" /> - + diff --git a/src/org/mapsforge/android/swrenderer/DatabaseRenderer.java b/src/org/mapsforge/android/swrenderer/DatabaseRenderer.java index 40575434..1a291c73 100644 --- a/src/org/mapsforge/android/swrenderer/DatabaseRenderer.java +++ b/src/org/mapsforge/android/swrenderer/DatabaseRenderer.java @@ -33,10 +33,10 @@ import org.mapsforge.android.rendertheme.renderinstruction.Line; import org.mapsforge.core.GeoPoint; import org.mapsforge.core.Tag; import org.mapsforge.core.Tile; -import org.mapsforge.mapdatabase.IMapDatabase; -import org.mapsforge.mapdatabase.IMapDatabaseCallback; -import org.mapsforge.mapdatabase.MapFileInfo; -import org.mapsforge.mapdatabase.mapfile.MapDatabase; +import org.mapsforge.database.IMapDatabase; +import org.mapsforge.database.IMapDatabaseCallback; +import org.mapsforge.database.MapFileInfo; +import org.mapsforge.database.mapfile.MapDatabase; import org.xml.sax.SAXException; import android.graphics.Bitmap; diff --git a/src/org/mapsforge/mapdatabase/FileOpenResult.java b/src/org/mapsforge/database/FileOpenResult.java similarity index 98% rename from src/org/mapsforge/mapdatabase/FileOpenResult.java rename to src/org/mapsforge/database/FileOpenResult.java index d3132427..5662db7b 100644 --- a/src/org/mapsforge/mapdatabase/FileOpenResult.java +++ b/src/org/mapsforge/database/FileOpenResult.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.mapdatabase; +package org.mapsforge.database; /** diff --git a/src/org/mapsforge/mapdatabase/IMapDatabase.java b/src/org/mapsforge/database/IMapDatabase.java similarity index 98% rename from src/org/mapsforge/mapdatabase/IMapDatabase.java rename to src/org/mapsforge/database/IMapDatabase.java index bc319241..91dd43d9 100644 --- a/src/org/mapsforge/mapdatabase/IMapDatabase.java +++ b/src/org/mapsforge/database/IMapDatabase.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.mapdatabase; +package org.mapsforge.database; import java.io.File; diff --git a/src/org/mapsforge/mapdatabase/IMapDatabaseCallback.java b/src/org/mapsforge/database/IMapDatabaseCallback.java similarity index 95% rename from src/org/mapsforge/mapdatabase/IMapDatabaseCallback.java rename to src/org/mapsforge/database/IMapDatabaseCallback.java index ccbb44ff..b3e71f14 100644 --- a/src/org/mapsforge/mapdatabase/IMapDatabaseCallback.java +++ b/src/org/mapsforge/database/IMapDatabaseCallback.java @@ -12,10 +12,10 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.mapdatabase; +package org.mapsforge.database; import org.mapsforge.core.Tag; -import org.mapsforge.mapdatabase.mapfile.MapDatabase; +import org.mapsforge.database.mapfile.MapDatabase; /** * Callback methods which can be triggered from the {@link MapDatabase}. diff --git a/src/org/mapsforge/mapdatabase/MapFileInfo.java b/src/org/mapsforge/database/MapFileInfo.java similarity index 97% rename from src/org/mapsforge/mapdatabase/MapFileInfo.java rename to src/org/mapsforge/database/MapFileInfo.java index 6c10dc66..0213666e 100644 --- a/src/org/mapsforge/mapdatabase/MapFileInfo.java +++ b/src/org/mapsforge/database/MapFileInfo.java @@ -12,11 +12,11 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.mapdatabase; +package org.mapsforge.database; import org.mapsforge.core.BoundingBox; import org.mapsforge.core.GeoPoint; -import org.mapsforge.mapdatabase.mapfile.MapDatabase; +import org.mapsforge.database.mapfile.MapDatabase; /** * Contains the immutable metadata of a map file. diff --git a/src/org/mapsforge/mapdatabase/json/MapDatabase.java b/src/org/mapsforge/database/json/MapDatabase.java similarity index 94% rename from src/org/mapsforge/mapdatabase/json/MapDatabase.java rename to src/org/mapsforge/database/json/MapDatabase.java index 55622a6b..98085ce3 100644 --- a/src/org/mapsforge/mapdatabase/json/MapDatabase.java +++ b/src/org/mapsforge/database/json/MapDatabase.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.mapdatabase.json; +package org.mapsforge.database.json; import java.io.File; @@ -20,10 +20,10 @@ import org.mapsforge.core.BoundingBox; import org.mapsforge.core.MercatorProjection; import org.mapsforge.core.Tag; import org.mapsforge.core.Tile; -import org.mapsforge.mapdatabase.FileOpenResult; -import org.mapsforge.mapdatabase.IMapDatabase; -import org.mapsforge.mapdatabase.IMapDatabaseCallback; -import org.mapsforge.mapdatabase.MapFileInfo; +import org.mapsforge.database.FileOpenResult; +import org.mapsforge.database.IMapDatabase; +import org.mapsforge.database.IMapDatabaseCallback; +import org.mapsforge.database.MapFileInfo; /** * diff --git a/src/org/mapsforge/mapdatabase/mapfile/Deserializer.java b/src/org/mapsforge/database/mapfile/Deserializer.java similarity index 98% rename from src/org/mapsforge/mapdatabase/mapfile/Deserializer.java rename to src/org/mapsforge/database/mapfile/Deserializer.java index 18a0565c..478f3e21 100644 --- a/src/org/mapsforge/mapdatabase/mapfile/Deserializer.java +++ b/src/org/mapsforge/database/mapfile/Deserializer.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.mapdatabase.mapfile; +package org.mapsforge.database.mapfile; /** * This utility class contains methods to convert byte arrays to numbers. diff --git a/src/org/mapsforge/mapdatabase/mapfile/IndexCache.java b/src/org/mapsforge/database/mapfile/IndexCache.java similarity index 97% rename from src/org/mapsforge/mapdatabase/mapfile/IndexCache.java rename to src/org/mapsforge/database/mapfile/IndexCache.java index 1c3dd84d..853f9f64 100644 --- a/src/org/mapsforge/mapdatabase/mapfile/IndexCache.java +++ b/src/org/mapsforge/database/mapfile/IndexCache.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.mapdatabase.mapfile; +package org.mapsforge.database.mapfile; import java.io.IOException; import java.io.RandomAccessFile; @@ -21,7 +21,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.mapsforge.core.LRUCache; -import org.mapsforge.mapdatabase.mapfile.header.SubFileParameter; +import org.mapsforge.database.mapfile.header.SubFileParameter; /** * A cache for database index blocks with a fixed size and LRU policy. diff --git a/src/org/mapsforge/mapdatabase/mapfile/IndexCacheEntryKey.java b/src/org/mapsforge/database/mapfile/IndexCacheEntryKey.java similarity index 95% rename from src/org/mapsforge/mapdatabase/mapfile/IndexCacheEntryKey.java rename to src/org/mapsforge/database/mapfile/IndexCacheEntryKey.java index 937e056d..d1207a93 100644 --- a/src/org/mapsforge/mapdatabase/mapfile/IndexCacheEntryKey.java +++ b/src/org/mapsforge/database/mapfile/IndexCacheEntryKey.java @@ -12,9 +12,9 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.mapdatabase.mapfile; +package org.mapsforge.database.mapfile; -import org.mapsforge.mapdatabase.mapfile.header.SubFileParameter; +import org.mapsforge.database.mapfile.header.SubFileParameter; /** * An immutable container class which is the key for the index cache. diff --git a/src/org/mapsforge/mapdatabase/mapfile/MapDatabase.java b/src/org/mapsforge/database/mapfile/MapDatabase.java similarity index 98% rename from src/org/mapsforge/mapdatabase/mapfile/MapDatabase.java rename to src/org/mapsforge/database/mapfile/MapDatabase.java index c9db8e9b..c29499f1 100644 --- a/src/org/mapsforge/mapdatabase/mapfile/MapDatabase.java +++ b/src/org/mapsforge/database/mapfile/MapDatabase.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.mapdatabase.mapfile; +package org.mapsforge.database.mapfile; import java.io.File; import java.io.IOException; @@ -23,12 +23,12 @@ import java.util.logging.Logger; import org.mapsforge.core.MercatorProjection; import org.mapsforge.core.Tag; import org.mapsforge.core.Tile; -import org.mapsforge.mapdatabase.FileOpenResult; -import org.mapsforge.mapdatabase.IMapDatabase; -import org.mapsforge.mapdatabase.IMapDatabaseCallback; -import org.mapsforge.mapdatabase.mapfile.header.MapFileHeader; -import org.mapsforge.mapdatabase.mapfile.header.MapFileInfo; -import org.mapsforge.mapdatabase.mapfile.header.SubFileParameter; +import org.mapsforge.database.FileOpenResult; +import org.mapsforge.database.IMapDatabase; +import org.mapsforge.database.IMapDatabaseCallback; +import org.mapsforge.database.mapfile.header.MapFileHeader; +import org.mapsforge.database.mapfile.header.MapFileInfo; +import org.mapsforge.database.mapfile.header.SubFileParameter; /** * A class for reading binary map files. @@ -227,6 +227,9 @@ public class MapDatabase implements IMapDatabase { */ @Override public void executeQuery(Tile tile, IMapDatabaseCallback mapDatabaseCallback) { + if (mMapFileHeader == null) + return; + if (mIntBuffer == null) mIntBuffer = new int[MAXIMUM_WAY_NODES_SEQUENCE_LENGTH * 2]; diff --git a/src/org/mapsforge/mapdatabase/mapfile/QueryCalculations.java b/src/org/mapsforge/database/mapfile/QueryCalculations.java similarity index 98% rename from src/org/mapsforge/mapdatabase/mapfile/QueryCalculations.java rename to src/org/mapsforge/database/mapfile/QueryCalculations.java index afcfc529..f8e6507c 100644 --- a/src/org/mapsforge/mapdatabase/mapfile/QueryCalculations.java +++ b/src/org/mapsforge/database/mapfile/QueryCalculations.java @@ -12,10 +12,10 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.mapdatabase.mapfile; +package org.mapsforge.database.mapfile; import org.mapsforge.core.Tile; -import org.mapsforge.mapdatabase.mapfile.header.SubFileParameter; +import org.mapsforge.database.mapfile.header.SubFileParameter; final class QueryCalculations { private static int getFirstLevelTileBitmask(Tile tile) { diff --git a/src/org/mapsforge/mapdatabase/mapfile/QueryParameters.java b/src/org/mapsforge/database/mapfile/QueryParameters.java similarity index 97% rename from src/org/mapsforge/mapdatabase/mapfile/QueryParameters.java rename to src/org/mapsforge/database/mapfile/QueryParameters.java index 60c1e195..7b120f3b 100644 --- a/src/org/mapsforge/mapdatabase/mapfile/QueryParameters.java +++ b/src/org/mapsforge/database/mapfile/QueryParameters.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.mapdatabase.mapfile; +package org.mapsforge.database.mapfile; class QueryParameters { long fromBaseTileX; diff --git a/src/org/mapsforge/mapdatabase/mapfile/ReadBuffer.java b/src/org/mapsforge/database/mapfile/ReadBuffer.java similarity index 99% rename from src/org/mapsforge/mapdatabase/mapfile/ReadBuffer.java rename to src/org/mapsforge/database/mapfile/ReadBuffer.java index 8e1cb7c9..f5b05eca 100644 --- a/src/org/mapsforge/mapdatabase/mapfile/ReadBuffer.java +++ b/src/org/mapsforge/database/mapfile/ReadBuffer.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.mapdatabase.mapfile; +package org.mapsforge.database.mapfile; import java.io.IOException; import java.io.RandomAccessFile; diff --git a/src/org/mapsforge/mapdatabase/mapfile/header/MapFileHeader.java b/src/org/mapsforge/database/mapfile/header/MapFileHeader.java similarity index 98% rename from src/org/mapsforge/mapdatabase/mapfile/header/MapFileHeader.java rename to src/org/mapsforge/database/mapfile/header/MapFileHeader.java index ff04cc54..8b01980d 100644 --- a/src/org/mapsforge/mapdatabase/mapfile/header/MapFileHeader.java +++ b/src/org/mapsforge/database/mapfile/header/MapFileHeader.java @@ -12,12 +12,12 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.mapdatabase.mapfile.header; +package org.mapsforge.database.mapfile.header; import java.io.IOException; -import org.mapsforge.mapdatabase.FileOpenResult; -import org.mapsforge.mapdatabase.mapfile.ReadBuffer; +import org.mapsforge.database.FileOpenResult; +import org.mapsforge.database.mapfile.ReadBuffer; /** * Reads and validates the header data from a binary map file. diff --git a/src/org/mapsforge/mapdatabase/mapfile/header/MapFileInfo.java b/src/org/mapsforge/database/mapfile/header/MapFileInfo.java similarity index 91% rename from src/org/mapsforge/mapdatabase/mapfile/header/MapFileInfo.java rename to src/org/mapsforge/database/mapfile/header/MapFileInfo.java index db3d8935..180663f0 100644 --- a/src/org/mapsforge/mapdatabase/mapfile/header/MapFileInfo.java +++ b/src/org/mapsforge/database/mapfile/header/MapFileInfo.java @@ -12,17 +12,17 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.mapdatabase.mapfile.header; +package org.mapsforge.database.mapfile.header; import org.mapsforge.core.Tag; -import org.mapsforge.mapdatabase.mapfile.MapDatabase; +import org.mapsforge.database.mapfile.MapDatabase; /** * Contains the immutable metadata of a map file. * * @see MapDatabase#getMapFileInfo() */ -public class MapFileInfo extends org.mapsforge.mapdatabase.MapFileInfo { +public class MapFileInfo extends org.mapsforge.database.MapFileInfo { /** * True if the map file includes debug information, false otherwise. diff --git a/src/org/mapsforge/mapdatabase/mapfile/header/MapFileInfoBuilder.java b/src/org/mapsforge/database/mapfile/header/MapFileInfoBuilder.java similarity index 95% rename from src/org/mapsforge/mapdatabase/mapfile/header/MapFileInfoBuilder.java rename to src/org/mapsforge/database/mapfile/header/MapFileInfoBuilder.java index 99fcc0c9..1b8e7c6c 100644 --- a/src/org/mapsforge/mapdatabase/mapfile/header/MapFileInfoBuilder.java +++ b/src/org/mapsforge/database/mapfile/header/MapFileInfoBuilder.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.mapdatabase.mapfile.header; +package org.mapsforge.database.mapfile.header; import org.mapsforge.core.BoundingBox; import org.mapsforge.core.Tag; diff --git a/src/org/mapsforge/mapdatabase/mapfile/header/OptionalFields.java b/src/org/mapsforge/database/mapfile/header/OptionalFields.java similarity index 97% rename from src/org/mapsforge/mapdatabase/mapfile/header/OptionalFields.java rename to src/org/mapsforge/database/mapfile/header/OptionalFields.java index 2efbb7a2..bb39d12e 100644 --- a/src/org/mapsforge/mapdatabase/mapfile/header/OptionalFields.java +++ b/src/org/mapsforge/database/mapfile/header/OptionalFields.java @@ -12,11 +12,11 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.mapdatabase.mapfile.header; +package org.mapsforge.database.mapfile.header; import org.mapsforge.core.GeoPoint; -import org.mapsforge.mapdatabase.FileOpenResult; -import org.mapsforge.mapdatabase.mapfile.ReadBuffer; +import org.mapsforge.database.FileOpenResult; +import org.mapsforge.database.mapfile.ReadBuffer; final class OptionalFields { /** diff --git a/src/org/mapsforge/mapdatabase/mapfile/header/RequiredFields.java b/src/org/mapsforge/database/mapfile/header/RequiredFields.java similarity index 98% rename from src/org/mapsforge/mapdatabase/mapfile/header/RequiredFields.java rename to src/org/mapsforge/database/mapfile/header/RequiredFields.java index 63dcb824..1648011d 100644 --- a/src/org/mapsforge/mapdatabase/mapfile/header/RequiredFields.java +++ b/src/org/mapsforge/database/mapfile/header/RequiredFields.java @@ -12,14 +12,14 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.mapdatabase.mapfile.header; +package org.mapsforge.database.mapfile.header; import java.io.IOException; import org.mapsforge.core.BoundingBox; import org.mapsforge.core.Tag; -import org.mapsforge.mapdatabase.FileOpenResult; -import org.mapsforge.mapdatabase.mapfile.ReadBuffer; +import org.mapsforge.database.FileOpenResult; +import org.mapsforge.database.mapfile.ReadBuffer; final class RequiredFields { /** diff --git a/src/org/mapsforge/mapdatabase/mapfile/header/SubFileParameter.java b/src/org/mapsforge/database/mapfile/header/SubFileParameter.java similarity index 99% rename from src/org/mapsforge/mapdatabase/mapfile/header/SubFileParameter.java rename to src/org/mapsforge/database/mapfile/header/SubFileParameter.java index c16a8b65..91399ba0 100644 --- a/src/org/mapsforge/mapdatabase/mapfile/header/SubFileParameter.java +++ b/src/org/mapsforge/database/mapfile/header/SubFileParameter.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.mapdatabase.mapfile.header; +package org.mapsforge.database.mapfile.header; import org.mapsforge.core.MercatorProjection; diff --git a/src/org/mapsforge/mapdatabase/mapfile/header/SubFileParameterBuilder.java b/src/org/mapsforge/database/mapfile/header/SubFileParameterBuilder.java similarity index 95% rename from src/org/mapsforge/mapdatabase/mapfile/header/SubFileParameterBuilder.java rename to src/org/mapsforge/database/mapfile/header/SubFileParameterBuilder.java index 7996aada..cbb5ab5d 100644 --- a/src/org/mapsforge/mapdatabase/mapfile/header/SubFileParameterBuilder.java +++ b/src/org/mapsforge/database/mapfile/header/SubFileParameterBuilder.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.mapdatabase.mapfile.header; +package org.mapsforge.database.mapfile.header; import org.mapsforge.core.BoundingBox; diff --git a/src/org/mapsforge/mapdatabase/postgis/Geometry.java b/src/org/mapsforge/database/postgis/Geometry.java similarity index 99% rename from src/org/mapsforge/mapdatabase/postgis/Geometry.java rename to src/org/mapsforge/database/postgis/Geometry.java index 68841aa7..b1b55b6a 100644 --- a/src/org/mapsforge/mapdatabase/postgis/Geometry.java +++ b/src/org/mapsforge/database/postgis/Geometry.java @@ -24,7 +24,7 @@ * $Id: Geometry.java 9324 2012-02-27 22:08:12Z pramsey $ */ -package org.mapsforge.mapdatabase.postgis; +package org.mapsforge.database.postgis; import java.io.Serializable; diff --git a/src/org/mapsforge/mapdatabase/postgis/MapDatabase.java b/src/org/mapsforge/database/postgis/MapDatabase.java similarity index 98% rename from src/org/mapsforge/mapdatabase/postgis/MapDatabase.java rename to src/org/mapsforge/database/postgis/MapDatabase.java index 507cc255..6b733906 100644 --- a/src/org/mapsforge/mapdatabase/postgis/MapDatabase.java +++ b/src/org/mapsforge/database/postgis/MapDatabase.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package org.mapsforge.mapdatabase.postgis; +package org.mapsforge.database.postgis; import java.io.File; import java.sql.Connection; @@ -29,10 +29,10 @@ import org.mapsforge.core.GeoPoint; import org.mapsforge.core.SphericalMercator; import org.mapsforge.core.Tag; import org.mapsforge.core.Tile; -import org.mapsforge.mapdatabase.FileOpenResult; -import org.mapsforge.mapdatabase.IMapDatabase; -import org.mapsforge.mapdatabase.IMapDatabaseCallback; -import org.mapsforge.mapdatabase.MapFileInfo; +import org.mapsforge.database.FileOpenResult; +import org.mapsforge.database.IMapDatabase; +import org.mapsforge.database.IMapDatabaseCallback; +import org.mapsforge.database.MapFileInfo; import org.postgresql.PGConnection; /** diff --git a/src/org/mapsforge/mapdatabase/postgis/PGHStore.java b/src/org/mapsforge/database/postgis/PGHStore.java similarity index 99% rename from src/org/mapsforge/mapdatabase/postgis/PGHStore.java rename to src/org/mapsforge/database/postgis/PGHStore.java index 015aac4a..245bfe81 100644 --- a/src/org/mapsforge/mapdatabase/postgis/PGHStore.java +++ b/src/org/mapsforge/database/postgis/PGHStore.java @@ -19,7 +19,7 @@ * *------------------------------------------------------------------------- */ -package org.mapsforge.mapdatabase.postgis; +package org.mapsforge.database.postgis; import java.sql.SQLException; import java.util.ArrayList; diff --git a/src/org/mapsforge/mapdatabase/postgis/ValueGetter.java b/src/org/mapsforge/database/postgis/ValueGetter.java similarity index 98% rename from src/org/mapsforge/mapdatabase/postgis/ValueGetter.java rename to src/org/mapsforge/database/postgis/ValueGetter.java index f16fe58d..9f142875 100644 --- a/src/org/mapsforge/mapdatabase/postgis/ValueGetter.java +++ b/src/org/mapsforge/database/postgis/ValueGetter.java @@ -22,7 +22,7 @@ * $Id: ValueGetter.java 9324 2012-02-27 22:08:12Z pramsey $ */ -package org.mapsforge.mapdatabase.postgis; +package org.mapsforge.database.postgis; abstract class ValueGetter { byte[] data; diff --git a/src/de/sfb/tilemap/FileUtils.java b/src/org/mapsforge/tilemap/FileUtils.java similarity index 97% rename from src/de/sfb/tilemap/FileUtils.java rename to src/org/mapsforge/tilemap/FileUtils.java index 7de77cdf..e6ad1054 100644 --- a/src/de/sfb/tilemap/FileUtils.java +++ b/src/org/mapsforge/tilemap/FileUtils.java @@ -12,12 +12,12 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package de.sfb.tilemap; +package org.mapsforge.tilemap; import java.text.DecimalFormat; import android.content.res.Resources; -import de.sfb.tilemap.R; +import org.mapsforge.tilemap.R; final class FileUtils { private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#.00 "); diff --git a/src/de/sfb/tilemap/InfoView.java b/src/org/mapsforge/tilemap/InfoView.java similarity index 98% rename from src/de/sfb/tilemap/InfoView.java rename to src/org/mapsforge/tilemap/InfoView.java index e31e4ad4..07c76d53 100644 --- a/src/de/sfb/tilemap/InfoView.java +++ b/src/org/mapsforge/tilemap/InfoView.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package de.sfb.tilemap; +package org.mapsforge.tilemap; import android.app.Activity; import android.os.Bundle; diff --git a/src/de/sfb/tilemap/MyLocationListener.java b/src/org/mapsforge/tilemap/MyLocationListener.java similarity index 98% rename from src/de/sfb/tilemap/MyLocationListener.java rename to src/org/mapsforge/tilemap/MyLocationListener.java index 4dbca49f..83cf0ad4 100644 --- a/src/de/sfb/tilemap/MyLocationListener.java +++ b/src/org/mapsforge/tilemap/MyLocationListener.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package de.sfb.tilemap; +package org.mapsforge.tilemap; import org.mapsforge.core.GeoPoint; diff --git a/src/de/sfb/tilemap/SeekBarChangeListener.java b/src/org/mapsforge/tilemap/SeekBarChangeListener.java similarity index 97% rename from src/de/sfb/tilemap/SeekBarChangeListener.java rename to src/org/mapsforge/tilemap/SeekBarChangeListener.java index 4583ed6f..622cc15c 100644 --- a/src/de/sfb/tilemap/SeekBarChangeListener.java +++ b/src/org/mapsforge/tilemap/SeekBarChangeListener.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package de.sfb.tilemap; +package org.mapsforge.tilemap; import android.widget.SeekBar; import android.widget.TextView; diff --git a/src/de/sfb/tilemap/TileMap.java b/src/org/mapsforge/tilemap/TileMap.java similarity index 94% rename from src/de/sfb/tilemap/TileMap.java rename to src/org/mapsforge/tilemap/TileMap.java index 83292ffc..ec7001b9 100755 --- a/src/de/sfb/tilemap/TileMap.java +++ b/src/org/mapsforge/tilemap/TileMap.java @@ -1,4 +1,4 @@ -package de.sfb.tilemap; +package org.mapsforge.tilemap; import java.io.FileFilter; import java.io.FileNotFoundException; @@ -17,8 +17,13 @@ import org.mapsforge.android.rendertheme.InternalRenderTheme; import org.mapsforge.android.utils.AndroidUtils; import org.mapsforge.core.BoundingBox; import org.mapsforge.core.GeoPoint; -import org.mapsforge.mapdatabase.IMapDatabase; -import org.mapsforge.mapdatabase.MapFileInfo; +import org.mapsforge.database.IMapDatabase; +import org.mapsforge.database.MapFileInfo; +import org.mapsforge.tilemap.filefilter.FilterByFileExtension; +import org.mapsforge.tilemap.filefilter.ValidMapFile; +import org.mapsforge.tilemap.filefilter.ValidRenderTheme; +import org.mapsforge.tilemap.filepicker.FilePicker; +import org.mapsforge.tilemap.preferences.EditPreferences; import android.app.AlertDialog; import android.app.Dialog; @@ -46,12 +51,6 @@ import android.widget.SeekBar; import android.widget.TextView; import android.widget.Toast; import android.widget.ToggleButton; -import de.sfb.tilemap.R; -import de.sfb.tilemap.filefilter.FilterByFileExtension; -import de.sfb.tilemap.filefilter.ValidMapFile; -import de.sfb.tilemap.filefilter.ValidRenderTheme; -import de.sfb.tilemap.filepicker.FilePicker; -import de.sfb.tilemap.preferences.EditPreferences; /** * A map application which uses the features from the mapsforge map library. The map can be centered to the current @@ -78,10 +77,12 @@ public class TileMap extends MapActivity { private WakeLock wakeLock; MapController mapController; MapView mapView; + private Menu mMenu = null; @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.options_menu, menu); + mMenu = menu; return true; } @@ -99,11 +100,21 @@ public class TileMap extends MapActivity { return true; case R.id.menu_position_my_location_enable: - enableShowMyLocation(true); + if (enableShowMyLocation(true)) { + mMenu.findItem(R.id.menu_position_my_location_enable).setVisible(false); + mMenu.findItem(R.id.menu_position_my_location_enable).setEnabled(false); + mMenu.findItem(R.id.menu_position_my_location_disable).setVisible(true); + mMenu.findItem(R.id.menu_position_my_location_disable).setEnabled(true); + } return true; case R.id.menu_position_my_location_disable: - disableShowMyLocation(); + if (disableShowMyLocation()) { + mMenu.findItem(R.id.menu_position_my_location_enable).setVisible(true); + mMenu.findItem(R.id.menu_position_my_location_enable).setEnabled(true); + mMenu.findItem(R.id.menu_position_my_location_disable).setVisible(false); + mMenu.findItem(R.id.menu_position_my_location_disable).setEnabled(false); + } return true; case R.id.menu_position_last_known: @@ -202,21 +213,23 @@ public class TileMap extends MapActivity { this.mapController = this.mapView.getController(); } - private void enableShowMyLocation(boolean centerAtFirstFix) { + private boolean enableShowMyLocation(boolean centerAtFirstFix) { if (!this.showMyLocation) { Criteria criteria = new Criteria(); criteria.setAccuracy(Criteria.ACCURACY_FINE); String bestProvider = this.locationManager.getBestProvider(criteria, true); if (bestProvider == null) { showDialog(DIALOG_LOCATION_PROVIDER_DISABLED); - return; + return false; } this.showMyLocation = true; this.myLocationListener.setCenterAtFirstFix(centerAtFirstFix); this.locationManager.requestLocationUpdates(bestProvider, 1000, 0, this.myLocationListener); this.snapToLocationView.setVisibility(View.VISIBLE); + return true; } + return false; } private void gotoLastKnownPosition() { @@ -527,8 +540,10 @@ public class TileMap extends MapActivity { /** * Disables the "show my location" mode. + * + * @return ... */ - void disableShowMyLocation() { + private boolean disableShowMyLocation() { if (this.showMyLocation) { this.showMyLocation = false; disableSnapToLocation(false); @@ -540,7 +555,9 @@ public class TileMap extends MapActivity { // this.itemizedOverlay = null; // } this.snapToLocationView.setVisibility(View.GONE); + return true; } + return false; } /** diff --git a/src/de/sfb/tilemap/filefilter/FilterByFileExtension.java b/src/org/mapsforge/tilemap/filefilter/FilterByFileExtension.java similarity index 97% rename from src/de/sfb/tilemap/filefilter/FilterByFileExtension.java rename to src/org/mapsforge/tilemap/filefilter/FilterByFileExtension.java index 094f24d5..bfe1e8c7 100644 --- a/src/de/sfb/tilemap/filefilter/FilterByFileExtension.java +++ b/src/org/mapsforge/tilemap/filefilter/FilterByFileExtension.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package de.sfb.tilemap.filefilter; +package org.mapsforge.tilemap.filefilter; import java.io.File; import java.io.FileFilter; diff --git a/src/de/sfb/tilemap/filefilter/ValidFileFilter.java b/src/org/mapsforge/tilemap/filefilter/ValidFileFilter.java similarity index 91% rename from src/de/sfb/tilemap/filefilter/ValidFileFilter.java rename to src/org/mapsforge/tilemap/filefilter/ValidFileFilter.java index 66736bd7..7b8eb2b6 100644 --- a/src/de/sfb/tilemap/filefilter/ValidFileFilter.java +++ b/src/org/mapsforge/tilemap/filefilter/ValidFileFilter.java @@ -12,11 +12,11 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package de.sfb.tilemap.filefilter; +package org.mapsforge.tilemap.filefilter; import java.io.FileFilter; -import org.mapsforge.mapdatabase.FileOpenResult; +import org.mapsforge.database.FileOpenResult; /** * An extension of the {@link FileFilter} interface. diff --git a/src/de/sfb/tilemap/filefilter/ValidMapFile.java b/src/org/mapsforge/tilemap/filefilter/ValidMapFile.java similarity index 86% rename from src/de/sfb/tilemap/filefilter/ValidMapFile.java rename to src/org/mapsforge/tilemap/filefilter/ValidMapFile.java index 4f44566a..436105fb 100644 --- a/src/de/sfb/tilemap/filefilter/ValidMapFile.java +++ b/src/org/mapsforge/tilemap/filefilter/ValidMapFile.java @@ -12,13 +12,13 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package de.sfb.tilemap.filefilter; +package org.mapsforge.tilemap.filefilter; import java.io.File; -import org.mapsforge.mapdatabase.FileOpenResult; -import org.mapsforge.mapdatabase.IMapDatabase; -import org.mapsforge.mapdatabase.mapfile.MapDatabase; +import org.mapsforge.database.FileOpenResult; +import org.mapsforge.database.IMapDatabase; +import org.mapsforge.database.mapfile.MapDatabase; /** * Accepts all valid map files. diff --git a/src/de/sfb/tilemap/filefilter/ValidRenderTheme.java b/src/org/mapsforge/tilemap/filefilter/ValidRenderTheme.java similarity index 96% rename from src/de/sfb/tilemap/filefilter/ValidRenderTheme.java rename to src/org/mapsforge/tilemap/filefilter/ValidRenderTheme.java index cbf410e9..2a584707 100644 --- a/src/de/sfb/tilemap/filefilter/ValidRenderTheme.java +++ b/src/org/mapsforge/tilemap/filefilter/ValidRenderTheme.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package de.sfb.tilemap.filefilter; +package org.mapsforge.tilemap.filefilter; import java.io.File; import java.io.FileInputStream; @@ -23,7 +23,7 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; import org.mapsforge.android.rendertheme.RenderThemeHandler; -import org.mapsforge.mapdatabase.FileOpenResult; +import org.mapsforge.database.FileOpenResult; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; diff --git a/src/de/sfb/tilemap/filepicker/FilePicker.java b/src/org/mapsforge/tilemap/filepicker/FilePicker.java similarity index 98% rename from src/de/sfb/tilemap/filepicker/FilePicker.java rename to src/org/mapsforge/tilemap/filepicker/FilePicker.java index 3d1c93a9..de81a213 100755 --- a/src/de/sfb/tilemap/filepicker/FilePicker.java +++ b/src/org/mapsforge/tilemap/filepicker/FilePicker.java @@ -12,13 +12,15 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package de.sfb.tilemap.filepicker; +package org.mapsforge.tilemap.filepicker; import java.io.File; import java.io.FileFilter; import java.util.Arrays; import java.util.Comparator; +import org.mapsforge.tilemap.filefilter.ValidFileFilter; + import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; @@ -31,8 +33,7 @@ import android.view.View; import android.view.WindowManager; import android.widget.AdapterView; import android.widget.GridView; -import de.sfb.tilemap.R; -import de.sfb.tilemap.filefilter.ValidFileFilter; +import org.mapsforge.tilemap.R; /** * A FilePicker displays the contents of directories. The user can navigate within the file system and select a single diff --git a/src/de/sfb/tilemap/filepicker/FilePickerIconAdapter.java b/src/org/mapsforge/tilemap/filepicker/FilePickerIconAdapter.java similarity index 97% rename from src/de/sfb/tilemap/filepicker/FilePickerIconAdapter.java rename to src/org/mapsforge/tilemap/filepicker/FilePickerIconAdapter.java index 41b6eff0..811a2f6a 100755 --- a/src/de/sfb/tilemap/filepicker/FilePickerIconAdapter.java +++ b/src/org/mapsforge/tilemap/filepicker/FilePickerIconAdapter.java @@ -12,11 +12,11 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package de.sfb.tilemap.filepicker; +package org.mapsforge.tilemap.filepicker; import java.io.File; -import de.sfb.tilemap.R; +import org.mapsforge.tilemap.R; import android.content.Context; import android.view.Gravity; diff --git a/src/de/sfb/tilemap/preferences/EditPreferences.java b/src/org/mapsforge/tilemap/preferences/EditPreferences.java similarity index 95% rename from src/de/sfb/tilemap/preferences/EditPreferences.java rename to src/org/mapsforge/tilemap/preferences/EditPreferences.java index 6c632355..72d8febb 100644 --- a/src/de/sfb/tilemap/preferences/EditPreferences.java +++ b/src/org/mapsforge/tilemap/preferences/EditPreferences.java @@ -12,13 +12,13 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package de.sfb.tilemap.preferences; +package org.mapsforge.tilemap.preferences; import android.os.Bundle; import android.preference.PreferenceActivity; import android.preference.PreferenceManager; import android.view.WindowManager; -import de.sfb.tilemap.R; +import org.mapsforge.tilemap.R; /** * Activity to edit the application preferences. diff --git a/src/de/sfb/tilemap/preferences/SeekBarPreference.java b/src/org/mapsforge/tilemap/preferences/SeekBarPreference.java similarity index 99% rename from src/de/sfb/tilemap/preferences/SeekBarPreference.java rename to src/org/mapsforge/tilemap/preferences/SeekBarPreference.java index 974aec22..9b4b7602 100644 --- a/src/de/sfb/tilemap/preferences/SeekBarPreference.java +++ b/src/org/mapsforge/tilemap/preferences/SeekBarPreference.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU Lesser General Public License along with * this program. If not, see . */ -package de.sfb.tilemap.preferences; +package org.mapsforge.tilemap.preferences; import android.content.Context; import android.content.DialogInterface;