diff --git a/OsmAnd/.classpath b/OsmAnd/.classpath index 52760d9732..e104318f7c 100644 --- a/OsmAnd/.classpath +++ b/OsmAnd/.classpath @@ -1,7 +1,7 @@ - + diff --git a/OsmAnd/res/layout-large/main.xml b/OsmAnd/res/layout-large/main.xml index c864fdc832..40bcf4d5f7 100644 --- a/OsmAnd/res/layout-large/main.xml +++ b/OsmAnd/res/layout-large/main.xml @@ -3,8 +3,8 @@ android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"> - - + diff --git a/OsmAnd/res/layout/main.xml b/OsmAnd/res/layout/main.xml index 0d7e60acf9..433c2474af 100644 --- a/OsmAnd/res/layout/main.xml +++ b/OsmAnd/res/layout/main.xml @@ -3,8 +3,8 @@ android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"> - - + diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 9f54cd2528..f6bd41706a 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -135,7 +135,7 @@ Downloading list of available indexes The index files are not loaded from osmand.googlecode.com. If you can\'t find your region, you can make it by yourself. -See osmand.googlecode.com. +See osmand.net. Auf Karte zeigen Favorite point was edited Keine favorisierten POI diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml index 402e52ebc3..cfe49abb6a 100644 --- a/OsmAnd/res/values-es/strings.xml +++ b/OsmAnd/res/values-es/strings.xml @@ -145,7 +145,7 @@ Descargando lista de índices disponibles Los archivos índices no son descargados de osmand.googlecode.com. Si no puede encontrar su región, puede descargarla usted mismo. -Ver osmand.googlecode.com. +Ver osmand.googlecode.net. Ver en mapa Se editó el punto favorito No hay puntos favoritos diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 67927d42bb..e05e6df664 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -152,7 +152,7 @@ Downloading list of available indexes The index files are not loaded from osmand.googlecode.com. If you can\'t find your region, you can make it by yourself. -See osmand.googlecode.com. +See osmand.net Show on map Favorite point was edited None of favorite points exist diff --git a/OsmAnd/src/com/osmand/AmenityIndexRepository.java b/OsmAnd/src/net/osmand/AmenityIndexRepository.java similarity index 94% rename from OsmAnd/src/com/osmand/AmenityIndexRepository.java rename to OsmAnd/src/net/osmand/AmenityIndexRepository.java index 66e6dfeeb3..1e2a87d6d7 100644 --- a/OsmAnd/src/com/osmand/AmenityIndexRepository.java +++ b/OsmAnd/src/net/osmand/AmenityIndexRepository.java @@ -1,4 +1,4 @@ -package com.osmand; +package net.osmand; import java.io.File; import java.io.IOException; @@ -7,22 +7,22 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; +import net.osmand.data.Amenity; +import net.osmand.data.AmenityType; +import net.osmand.data.index.IndexConstants; +import net.osmand.data.index.IndexConstants.IndexPoiTable; +import net.osmand.osm.Entity; +import net.osmand.osm.LatLon; +import net.osmand.osm.Node; +import net.osmand.osm.io.IOsmStorageFilter; +import net.osmand.osm.io.OsmBaseStorage; + import org.apache.commons.logging.Log; import org.xml.sax.SAXException; import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.osmand.data.Amenity; -import com.osmand.data.AmenityType; -import com.osmand.data.index.IndexConstants; -import com.osmand.data.index.IndexConstants.IndexPoiTable; -import com.osmand.osm.Entity; -import com.osmand.osm.LatLon; -import com.osmand.osm.Node; -import com.osmand.osm.io.IOsmStorageFilter; -import com.osmand.osm.io.OsmBaseStorage; - public class AmenityIndexRepository extends BaseLocationIndexRepository { private static final Log log = LogUtil.getLog(AmenityIndexRepository.class); public final static int LIMIT_AMENITIES = 500; diff --git a/OsmAnd/src/com/osmand/BaseLocationIndexRepository.java b/OsmAnd/src/net/osmand/BaseLocationIndexRepository.java similarity index 94% rename from OsmAnd/src/com/osmand/BaseLocationIndexRepository.java rename to OsmAnd/src/net/osmand/BaseLocationIndexRepository.java index 10420c05bc..3f0f48f3c2 100644 --- a/OsmAnd/src/com/osmand/BaseLocationIndexRepository.java +++ b/OsmAnd/src/net/osmand/BaseLocationIndexRepository.java @@ -1,18 +1,18 @@ -package com.osmand; +package net.osmand; import java.io.File; import java.util.ArrayList; import java.util.List; +import net.osmand.data.MapObject; +import net.osmand.osm.LatLon; + import org.apache.commons.logging.Log; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteStatement; -import com.osmand.data.MapObject; -import com.osmand.osm.LatLon; - public class BaseLocationIndexRepository { private static final Log log = LogUtil.getLog(BaseLocationIndexRepository.class); protected SQLiteDatabase db; diff --git a/OsmAnd/src/com/osmand/LogUtil.java b/OsmAnd/src/net/osmand/LogUtil.java similarity index 93% rename from OsmAnd/src/com/osmand/LogUtil.java rename to OsmAnd/src/net/osmand/LogUtil.java index 5a853d7098..0aef04c813 100644 --- a/OsmAnd/src/com/osmand/LogUtil.java +++ b/OsmAnd/src/net/osmand/LogUtil.java @@ -1,4 +1,4 @@ -package com.osmand; +package net.osmand; import org.apache.commons.logging.Log; @@ -9,14 +9,14 @@ import org.apache.commons.logging.Log; * 1. It is impossible to replace standard LogFactory (that is hidden in android.jar) * 2. Implementation of LogFactory always creates Logger.getLogger(String name) * 3. + It is possible to enable logger level by calling - * Logger.getLogger("com.osmand").setLevel(Level.ALL); + * Logger.getLogger("net.osmand").setLevel(Level.ALL); * 4. Logger goes to low level android.util.Log where android.util.Log#isLoggable(String, int) is checked * String tag -> is string of length 23 (stripped full class name) * 5. It is impossible to set for all tags debug level (info is default) - android.util.Log#isLoggable(String, int). * */ public class LogUtil { - public static String TAG = "com.osmand"; //$NON-NLS-1$ + public static String TAG = "net.osmand"; //$NON-NLS-1$ private static class OsmandLogImplementation implements Log { private final String fullName; diff --git a/OsmAnd/src/com/osmand/NameFinderPoiFilter.java b/OsmAnd/src/net/osmand/NameFinderPoiFilter.java similarity index 94% rename from OsmAnd/src/com/osmand/NameFinderPoiFilter.java rename to OsmAnd/src/net/osmand/NameFinderPoiFilter.java index ef021c8bb7..6be75caf0f 100644 --- a/OsmAnd/src/com/osmand/NameFinderPoiFilter.java +++ b/OsmAnd/src/net/osmand/NameFinderPoiFilter.java @@ -1,4 +1,4 @@ -package com.osmand; +package net.osmand; import java.io.IOException; import java.io.InputStream; @@ -7,16 +7,16 @@ import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; +import net.osmand.data.Amenity; +import net.osmand.data.AmenityType; +import net.osmand.osm.MapUtils; + import org.apache.commons.logging.Log; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import android.util.Xml; -import com.osmand.data.Amenity; -import com.osmand.data.AmenityType; -import com.osmand.osm.MapUtils; - public class NameFinderPoiFilter extends PoiFilter { public static final String FILTER_ID = "name_finder"; //$NON-NLS-1$ diff --git a/OsmAnd/src/com/osmand/NavigationService.java b/OsmAnd/src/net/osmand/NavigationService.java similarity index 94% rename from OsmAnd/src/com/osmand/NavigationService.java rename to OsmAnd/src/net/osmand/NavigationService.java index f5f7ad8310..828bd2d919 100644 --- a/OsmAnd/src/com/osmand/NavigationService.java +++ b/OsmAnd/src/net/osmand/NavigationService.java @@ -1,6 +1,8 @@ -package com.osmand; +package net.osmand; +import net.osmand.activities.RoutingHelper; +import net.osmand.activities.SavingTrackHelper; import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; @@ -18,9 +20,6 @@ import android.os.Handler; import android.os.IBinder; import android.widget.Toast; -import com.osmand.activities.RoutingHelper; -import com.osmand.activities.SavingTrackHelper; - public class NavigationService extends Service implements LocationListener { public static class NavigationServiceBinder extends Binder { diff --git a/OsmAnd/src/com/osmand/OsmandSettings.java b/OsmAnd/src/net/osmand/OsmandSettings.java similarity index 96% rename from OsmAnd/src/com/osmand/OsmandSettings.java rename to OsmAnd/src/net/osmand/OsmandSettings.java index 7c4a6c759d..14a0760e20 100644 --- a/OsmAnd/src/com/osmand/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/OsmandSettings.java @@ -1,4 +1,4 @@ -package com.osmand; +package net.osmand; import java.io.BufferedReader; import java.io.File; @@ -8,6 +8,12 @@ import java.io.InputStreamReader; import java.util.List; import java.util.regex.Pattern; +import net.osmand.activities.RouteProvider.RouteService; +import net.osmand.activities.search.SearchHistoryHelper; +import net.osmand.map.ITileSource; +import net.osmand.map.TileSourceManager; +import net.osmand.map.TileSourceManager.TileSourceTemplate; +import net.osmand.osm.LatLon; import android.content.Context; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; @@ -16,13 +22,6 @@ import android.location.LocationManager; import android.os.Environment; import android.util.Log; -import com.osmand.activities.RouteProvider.RouteService; -import com.osmand.activities.search.SearchHistoryHelper; -import com.osmand.map.ITileSource; -import com.osmand.map.TileSourceManager; -import com.osmand.map.TileSourceManager.TileSourceTemplate; -import com.osmand.osm.LatLon; - public class OsmandSettings { public enum ApplicationMode { @@ -47,7 +46,7 @@ public class OsmandSettings { } // These settings are stored in SharedPreferences - public static final String SHARED_PREFERENCES_NAME = "com.osmand.settings"; //$NON-NLS-1$ + public static final String SHARED_PREFERENCES_NAME = "net.osmand.settings"; //$NON-NLS-1$ public static final int CENTER_CONSTANT = 0; public static final int BOTTOM_CONSTANT = 1; diff --git a/OsmAnd/src/com/osmand/PoiFilter.java b/OsmAnd/src/net/osmand/PoiFilter.java similarity index 93% rename from OsmAnd/src/com/osmand/PoiFilter.java rename to OsmAnd/src/net/osmand/PoiFilter.java index 833721d34c..4a8d2ffa78 100644 --- a/OsmAnd/src/com/osmand/PoiFilter.java +++ b/OsmAnd/src/net/osmand/PoiFilter.java @@ -1,4 +1,4 @@ -package com.osmand; +package net.osmand; import java.util.ArrayList; import java.util.Collections; @@ -6,10 +6,10 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.osmand.data.Amenity; -import com.osmand.data.AmenityType; -import com.osmand.data.index.IndexConstants.IndexPoiTable; -import com.osmand.osm.MapUtils; +import net.osmand.data.Amenity; +import net.osmand.data.AmenityType; +import net.osmand.data.index.IndexConstants.IndexPoiTable; +import net.osmand.osm.MapUtils; public class PoiFilter { diff --git a/OsmAnd/src/com/osmand/PoiFiltersHelper.java b/OsmAnd/src/net/osmand/PoiFiltersHelper.java similarity index 96% rename from OsmAnd/src/com/osmand/PoiFiltersHelper.java rename to OsmAnd/src/net/osmand/PoiFiltersHelper.java index 50ee8eda59..589b9a311b 100644 --- a/OsmAnd/src/com/osmand/PoiFiltersHelper.java +++ b/OsmAnd/src/net/osmand/PoiFiltersHelper.java @@ -1,4 +1,4 @@ -package com.osmand; +package net.osmand; import java.util.ArrayList; import java.util.Collections; @@ -6,14 +6,13 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import net.osmand.data.AmenityType; import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteStatement; -import com.osmand.data.AmenityType; - public class PoiFiltersHelper { public static PoiFilter getFilterById(Context ctx, String filterId){ diff --git a/OsmAnd/src/com/osmand/ProgressDialogImplementation.java b/OsmAnd/src/net/osmand/ProgressDialogImplementation.java similarity index 94% rename from OsmAnd/src/com/osmand/ProgressDialogImplementation.java rename to OsmAnd/src/net/osmand/ProgressDialogImplementation.java index a5baefa6f3..f218cd5f42 100644 --- a/OsmAnd/src/com/osmand/ProgressDialogImplementation.java +++ b/OsmAnd/src/net/osmand/ProgressDialogImplementation.java @@ -1,4 +1,4 @@ -package com.osmand; +package net.osmand; import android.app.ProgressDialog; import android.content.Context; diff --git a/OsmAnd/src/com/osmand/RegionAddressRepository.java b/OsmAnd/src/net/osmand/RegionAddressRepository.java similarity index 93% rename from OsmAnd/src/com/osmand/RegionAddressRepository.java rename to OsmAnd/src/net/osmand/RegionAddressRepository.java index 01f6610381..1633a166c7 100644 --- a/OsmAnd/src/com/osmand/RegionAddressRepository.java +++ b/OsmAnd/src/net/osmand/RegionAddressRepository.java @@ -1,4 +1,4 @@ -package com.osmand; +package net.osmand; import java.io.File; import java.text.Collator; @@ -15,28 +15,28 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; +import net.osmand.data.Building; +import net.osmand.data.City; +import net.osmand.data.MapObject; +import net.osmand.data.PostCode; +import net.osmand.data.Region; +import net.osmand.data.Street; +import net.osmand.data.City.CityType; +import net.osmand.data.index.IndexConstants; +import net.osmand.data.index.IndexConstants.IndexBuildingTable; +import net.osmand.data.index.IndexConstants.IndexCityTable; +import net.osmand.data.index.IndexConstants.IndexStreetNodeTable; +import net.osmand.data.index.IndexConstants.IndexStreetTable; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; +import net.osmand.osm.Node; +import net.osmand.osm.Way; + import org.apache.commons.logging.Log; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import com.osmand.data.Building; -import com.osmand.data.City; -import com.osmand.data.MapObject; -import com.osmand.data.PostCode; -import com.osmand.data.Region; -import com.osmand.data.Street; -import com.osmand.data.City.CityType; -import com.osmand.data.index.IndexConstants; -import com.osmand.data.index.IndexConstants.IndexBuildingTable; -import com.osmand.data.index.IndexConstants.IndexCityTable; -import com.osmand.data.index.IndexConstants.IndexStreetNodeTable; -import com.osmand.data.index.IndexConstants.IndexStreetTable; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; -import com.osmand.osm.Node; -import com.osmand.osm.Way; - public class RegionAddressRepository { private static final Log log = LogUtil.getLog(RegionAddressRepository.class); diff --git a/OsmAnd/src/com/osmand/ResourceManager.java b/OsmAnd/src/net/osmand/ResourceManager.java similarity index 95% rename from OsmAnd/src/com/osmand/ResourceManager.java rename to OsmAnd/src/net/osmand/ResourceManager.java index 20e0c28074..4578a69603 100644 --- a/OsmAnd/src/com/osmand/ResourceManager.java +++ b/OsmAnd/src/net/osmand/ResourceManager.java @@ -1,4 +1,4 @@ -package com.osmand; +package net.osmand; import java.io.File; import java.io.IOException; @@ -12,24 +12,24 @@ import java.util.Map; import java.util.Stack; import java.util.TreeMap; +import net.osmand.data.Amenity; +import net.osmand.data.TransportStop; +import net.osmand.data.index.IndexConstants; +import net.osmand.data.preparation.MapTileDownloader; +import net.osmand.data.preparation.MapTileDownloader.DownloadRequest; +import net.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback; +import net.osmand.map.ITileSource; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; +import net.osmand.render.RenderMapsRepositories; +import net.osmand.views.POIMapLayer; + import org.apache.commons.logging.Log; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.Environment; -import com.osmand.data.Amenity; -import com.osmand.data.TransportStop; -import com.osmand.data.index.IndexConstants; -import com.osmand.data.preparation.MapTileDownloader; -import com.osmand.data.preparation.MapTileDownloader.DownloadRequest; -import com.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback; -import com.osmand.map.ITileSource; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; -import com.osmand.render.RenderMapsRepositories; -import com.osmand.views.POIMapLayer; - /** * Resource manager is responsible to work with all resources * that could consume memory (especially with file resources). diff --git a/OsmAnd/src/com/osmand/SQLiteTileSource.java b/OsmAnd/src/net/osmand/SQLiteTileSource.java similarity index 93% rename from OsmAnd/src/com/osmand/SQLiteTileSource.java rename to OsmAnd/src/net/osmand/SQLiteTileSource.java index f572576403..6e660ec630 100644 --- a/OsmAnd/src/com/osmand/SQLiteTileSource.java +++ b/OsmAnd/src/net/osmand/SQLiteTileSource.java @@ -1,4 +1,4 @@ -package com.osmand; +package net.osmand; import java.io.File; import java.io.FileInputStream; @@ -6,6 +6,10 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.text.MessageFormat; +import net.osmand.map.ITileSource; +import net.osmand.map.TileSourceManager; +import net.osmand.map.TileSourceManager.TileSourceTemplate; + import org.apache.commons.logging.Log; import android.database.Cursor; @@ -14,10 +18,6 @@ import android.database.sqlite.SQLiteStatement; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import com.osmand.map.ITileSource; -import com.osmand.map.TileSourceManager; -import com.osmand.map.TileSourceManager.TileSourceTemplate; - public class SQLiteTileSource implements ITileSource { diff --git a/OsmAnd/src/com/osmand/TransportIndexRepository.java b/OsmAnd/src/net/osmand/TransportIndexRepository.java similarity index 95% rename from OsmAnd/src/com/osmand/TransportIndexRepository.java rename to OsmAnd/src/net/osmand/TransportIndexRepository.java index 6885980410..f3a47129d9 100644 --- a/OsmAnd/src/com/osmand/TransportIndexRepository.java +++ b/OsmAnd/src/net/osmand/TransportIndexRepository.java @@ -1,4 +1,4 @@ -package com.osmand; +package net.osmand; import java.io.File; import java.text.MessageFormat; @@ -9,19 +9,19 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import net.osmand.data.TransportRoute; +import net.osmand.data.TransportStop; +import net.osmand.data.index.IndexConstants; +import net.osmand.data.index.IndexConstants.IndexTransportRoute; +import net.osmand.data.index.IndexConstants.IndexTransportRouteStop; +import net.osmand.data.index.IndexConstants.IndexTransportStop; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; + import org.apache.commons.logging.Log; import android.database.Cursor; -import com.osmand.data.TransportRoute; -import com.osmand.data.TransportStop; -import com.osmand.data.index.IndexConstants; -import com.osmand.data.index.IndexConstants.IndexTransportRoute; -import com.osmand.data.index.IndexConstants.IndexTransportRouteStop; -import com.osmand.data.index.IndexConstants.IndexTransportStop; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; - public class TransportIndexRepository extends BaseLocationIndexRepository { private static final Log log = LogUtil.getLog(TransportIndexRepository.class); diff --git a/OsmAnd/src/com/osmand/activities/DownloadIndexActivity.java b/OsmAnd/src/net/osmand/activities/DownloadIndexActivity.java similarity index 94% rename from OsmAnd/src/com/osmand/activities/DownloadIndexActivity.java rename to OsmAnd/src/net/osmand/activities/DownloadIndexActivity.java index bae69841b2..0e4a73557a 100644 --- a/OsmAnd/src/com/osmand/activities/DownloadIndexActivity.java +++ b/OsmAnd/src/net/osmand/activities/DownloadIndexActivity.java @@ -1,4 +1,4 @@ -package com.osmand.activities; +package net.osmand.activities; import java.io.File; import java.io.FileInputStream; @@ -17,6 +17,13 @@ import java.util.Map.Entry; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import net.osmand.LogUtil; +import net.osmand.ProgressDialogImplementation; +import net.osmand.R; +import net.osmand.ResourceManager; +import net.osmand.data.index.DownloaderIndexFromGoogleCode; +import net.osmand.data.index.IndexConstants; + import org.apache.commons.logging.Log; import android.app.AlertDialog; @@ -34,13 +41,6 @@ import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; -import com.osmand.LogUtil; -import com.osmand.ProgressDialogImplementation; -import com.osmand.R; -import com.osmand.ResourceManager; -import com.osmand.data.index.DownloaderIndexFromGoogleCode; -import com.osmand.data.index.IndexConstants; - public class DownloadIndexActivity extends ListActivity { private final static Log log = LogUtil.getLog(DownloadIndexActivity.class); @@ -275,7 +275,7 @@ public class DownloadIndexActivity extends ListActivity { private class DownloadIndexAdapter extends ArrayAdapter> { public DownloadIndexAdapter(List> array) { - super(DownloadIndexActivity.this, com.osmand.R.layout.download_index_list_item, array); + super(DownloadIndexActivity.this, net.osmand.R.layout.download_index_list_item, array); } @Override @@ -283,7 +283,7 @@ public class DownloadIndexActivity extends ListActivity { View row = convertView; if (row == null) { LayoutInflater inflater = getLayoutInflater(); - row = inflater.inflate(com.osmand.R.layout.download_index_list_item, parent, false); + row = inflater.inflate(net.osmand.R.layout.download_index_list_item, parent, false); } TextView item = (TextView) row.findViewById(R.id.download_item); TextView description = (TextView) row.findViewById(R.id.download_descr); diff --git a/OsmAnd/src/com/osmand/activities/EditPOIFilterActivity.java b/OsmAnd/src/net/osmand/activities/EditPOIFilterActivity.java similarity index 93% rename from OsmAnd/src/com/osmand/activities/EditPOIFilterActivity.java rename to OsmAnd/src/net/osmand/activities/EditPOIFilterActivity.java index e9b0a84fe1..c3fed2efba 100644 --- a/OsmAnd/src/com/osmand/activities/EditPOIFilterActivity.java +++ b/OsmAnd/src/net/osmand/activities/EditPOIFilterActivity.java @@ -1,13 +1,19 @@ /** * */ -package com.osmand.activities; +package net.osmand.activities; import java.text.MessageFormat; import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; +import net.osmand.PoiFilter; +import net.osmand.PoiFiltersHelper; +import net.osmand.R; +import net.osmand.PoiFiltersHelper.PoiFilterDbHelper; +import net.osmand.activities.search.SearchPOIActivity; +import net.osmand.data.AmenityType; import android.app.AlertDialog; import android.app.ListActivity; import android.app.AlertDialog.Builder; @@ -30,19 +36,12 @@ import android.widget.ScrollView; import android.widget.TextView; import android.widget.Toast; -import com.osmand.PoiFilter; -import com.osmand.PoiFiltersHelper; -import com.osmand.R; -import com.osmand.PoiFiltersHelper.PoiFilterDbHelper; -import com.osmand.activities.search.SearchPOIActivity; -import com.osmand.data.AmenityType; - /** * @author Frolov * */ public class EditPOIFilterActivity extends ListActivity { - public static final String AMENITY_FILTER = "com.osmand.amenity_filter"; //$NON-NLS-1$ + public static final String AMENITY_FILTER = "net.osmand.amenity_filter"; //$NON-NLS-1$ private Button filterLevel; private PoiFilter filter; private PoiFilterDbHelper helper; diff --git a/OsmAnd/src/com/osmand/activities/EditingPOIActivity.java b/OsmAnd/src/net/osmand/activities/EditingPOIActivity.java similarity index 94% rename from OsmAnd/src/com/osmand/activities/EditingPOIActivity.java rename to OsmAnd/src/net/osmand/activities/EditingPOIActivity.java index c188dca76e..2135c49d3f 100644 --- a/OsmAnd/src/com/osmand/activities/EditingPOIActivity.java +++ b/OsmAnd/src/net/osmand/activities/EditingPOIActivity.java @@ -1,4 +1,4 @@ -package com.osmand.activities; +package net.osmand.activities; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -18,6 +18,28 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import net.osmand.AmenityIndexRepository; +import net.osmand.Base64; +import net.osmand.LogUtil; +import net.osmand.OsmandSettings; +import net.osmand.R; +import net.osmand.ResourceManager; +import net.osmand.Version; +import net.osmand.data.Amenity; +import net.osmand.data.AmenityType; +import net.osmand.osm.Entity; +import net.osmand.osm.EntityInfo; +import net.osmand.osm.MapUtils; +import net.osmand.osm.Node; +import net.osmand.osm.OpeningHoursParser; +import net.osmand.osm.Entity.EntityId; +import net.osmand.osm.Entity.EntityType; +import net.osmand.osm.OSMSettings.OSMTagKey; +import net.osmand.osm.OpeningHoursParser.BasicDayOpeningHourRule; +import net.osmand.osm.OpeningHoursParser.OpeningHoursRule; +import net.osmand.osm.io.OsmBaseStorage; +import net.osmand.views.OsmandMapTileView; + import org.apache.commons.logging.Log; import org.apache.http.HttpResponse; import org.apache.http.auth.AuthScope; @@ -51,28 +73,6 @@ import android.widget.Button; import android.widget.EditText; import android.widget.Toast; -import com.osmand.AmenityIndexRepository; -import com.osmand.Base64; -import com.osmand.LogUtil; -import com.osmand.OsmandSettings; -import com.osmand.R; -import com.osmand.ResourceManager; -import com.osmand.Version; -import com.osmand.data.Amenity; -import com.osmand.data.AmenityType; -import com.osmand.osm.Entity; -import com.osmand.osm.EntityInfo; -import com.osmand.osm.MapUtils; -import com.osmand.osm.Node; -import com.osmand.osm.OpeningHoursParser; -import com.osmand.osm.Entity.EntityId; -import com.osmand.osm.Entity.EntityType; -import com.osmand.osm.OSMSettings.OSMTagKey; -import com.osmand.osm.OpeningHoursParser.BasicDayOpeningHourRule; -import com.osmand.osm.OpeningHoursParser.OpeningHoursRule; -import com.osmand.osm.io.OsmBaseStorage; -import com.osmand.views.OsmandMapTileView; - public class EditingPOIActivity { // private final static String SITE_API = "http://api06.dev.openstreetmap.org/"; diff --git a/OsmAnd/src/com/osmand/activities/FavouritesActivity.java b/OsmAnd/src/net/osmand/activities/FavouritesActivity.java similarity index 95% rename from OsmAnd/src/com/osmand/activities/FavouritesActivity.java rename to OsmAnd/src/net/osmand/activities/FavouritesActivity.java index faaa06c7c6..4e4faff53c 100644 --- a/OsmAnd/src/com/osmand/activities/FavouritesActivity.java +++ b/OsmAnd/src/net/osmand/activities/FavouritesActivity.java @@ -1,7 +1,7 @@ /** * */ -package com.osmand.activities; +package net.osmand.activities; import java.io.File; import java.text.MessageFormat; @@ -10,6 +10,12 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import net.osmand.OsmandSettings; +import net.osmand.R; +import net.osmand.ResourceManager; +import net.osmand.activities.SavingTrackHelper.WptPt; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; import android.app.AlertDialog; import android.app.ListActivity; import android.app.AlertDialog.Builder; @@ -37,13 +43,6 @@ import android.widget.TextView; import android.widget.Toast; import android.widget.AdapterView.AdapterContextMenuInfo; -import com.osmand.OsmandSettings; -import com.osmand.R; -import com.osmand.ResourceManager; -import com.osmand.activities.SavingTrackHelper.WptPt; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; - /** * */ diff --git a/OsmAnd/src/com/osmand/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/activities/MainMenuActivity.java similarity index 94% rename from OsmAnd/src/com/osmand/activities/MainMenuActivity.java rename to OsmAnd/src/net/osmand/activities/MainMenuActivity.java index e87861f29a..937fae4022 100644 --- a/OsmAnd/src/com/osmand/activities/MainMenuActivity.java +++ b/OsmAnd/src/net/osmand/activities/MainMenuActivity.java @@ -1,4 +1,4 @@ -package com.osmand.activities; +package net.osmand.activities; import java.io.BufferedWriter; import java.io.ByteArrayOutputStream; @@ -9,6 +9,13 @@ import java.lang.Thread.UncaughtExceptionHandler; import java.text.MessageFormat; import java.util.List; +import net.osmand.LogUtil; +import net.osmand.ProgressDialogImplementation; +import net.osmand.R; +import net.osmand.ResourceManager; +import net.osmand.Version; +import net.osmand.activities.search.SearchActivity; +import net.osmand.voice.CommandPlayer; import android.app.Activity; import android.app.AlertDialog; import android.app.ProgressDialog; @@ -31,14 +38,6 @@ import android.view.View.OnClickListener; import android.widget.Button; import android.widget.Toast; -import com.osmand.LogUtil; -import com.osmand.ProgressDialogImplementation; -import com.osmand.R; -import com.osmand.ResourceManager; -import com.osmand.Version; -import com.osmand.activities.search.SearchActivity; -import com.osmand.voice.CommandPlayer; - public class MainMenuActivity extends Activity { private static final String FIRST_TIME_APP_RUN = "FIRST_TIME_APP_RUN"; //$NON-NLS-1$ diff --git a/OsmAnd/src/com/osmand/activities/MapActivity.java b/OsmAnd/src/net/osmand/activities/MapActivity.java similarity index 94% rename from OsmAnd/src/com/osmand/activities/MapActivity.java rename to OsmAnd/src/net/osmand/activities/MapActivity.java index d5bfd6599c..41ada34e8b 100644 --- a/OsmAnd/src/com/osmand/activities/MapActivity.java +++ b/OsmAnd/src/net/osmand/activities/MapActivity.java @@ -1,4 +1,4 @@ -package com.osmand.activities; +package net.osmand.activities; import java.text.MessageFormat; import java.util.ArrayList; @@ -6,6 +6,45 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import net.osmand.Algoritms; +import net.osmand.AmenityIndexRepository; +import net.osmand.LogUtil; +import net.osmand.OsmandSettings; +import net.osmand.PoiFilter; +import net.osmand.PoiFiltersHelper; +import net.osmand.R; +import net.osmand.ResourceManager; +import net.osmand.SQLiteTileSource; +import net.osmand.Version; +import net.osmand.OsmandSettings.ApplicationMode; +import net.osmand.activities.FavouritesActivity.FavouritePoint; +import net.osmand.activities.FavouritesActivity.FavouritesDbHelper; +import net.osmand.activities.search.SearchActivity; +import net.osmand.activities.search.SearchPoiFilterActivity; +import net.osmand.activities.search.SearchTransportActivity; +import net.osmand.data.Amenity; +import net.osmand.data.AmenityType; +import net.osmand.data.preparation.MapTileDownloader; +import net.osmand.data.preparation.MapTileDownloader.DownloadRequest; +import net.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback; +import net.osmand.map.IMapLocationListener; +import net.osmand.map.ITileSource; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; +import net.osmand.views.AnimateDraggingMapThread; +import net.osmand.views.ContextMenuLayer; +import net.osmand.views.FavoritesLayer; +import net.osmand.views.MapInfoLayer; +import net.osmand.views.OsmBugsLayer; +import net.osmand.views.OsmandMapTileView; +import net.osmand.views.POIMapLayer; +import net.osmand.views.PointLocationLayer; +import net.osmand.views.PointNavigationLayer; +import net.osmand.views.RouteInfoLayer; +import net.osmand.views.RouteLayer; +import net.osmand.views.TransportInfoLayer; +import net.osmand.views.TransportStopsLayer; +import net.osmand.views.YandexTrafficLayer; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; @@ -58,46 +97,6 @@ import android.widget.Toast; import android.widget.ToggleButton; import android.widget.ZoomControls; -import com.osmand.Algoritms; -import com.osmand.AmenityIndexRepository; -import com.osmand.LogUtil; -import com.osmand.OsmandSettings; -import com.osmand.PoiFilter; -import com.osmand.PoiFiltersHelper; -import com.osmand.R; -import com.osmand.ResourceManager; -import com.osmand.SQLiteTileSource; -import com.osmand.Version; -import com.osmand.OsmandSettings.ApplicationMode; -import com.osmand.activities.FavouritesActivity.FavouritePoint; -import com.osmand.activities.FavouritesActivity.FavouritesDbHelper; -import com.osmand.activities.search.SearchActivity; -import com.osmand.activities.search.SearchPoiFilterActivity; -import com.osmand.activities.search.SearchTransportActivity; -import com.osmand.data.Amenity; -import com.osmand.data.AmenityType; -import com.osmand.data.preparation.MapTileDownloader; -import com.osmand.data.preparation.MapTileDownloader.DownloadRequest; -import com.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback; -import com.osmand.map.IMapLocationListener; -import com.osmand.map.ITileSource; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; -import com.osmand.views.AnimateDraggingMapThread; -import com.osmand.views.ContextMenuLayer; -import com.osmand.views.FavoritesLayer; -import com.osmand.views.MapInfoLayer; -import com.osmand.views.OsmBugsLayer; -import com.osmand.views.OsmandMapTileView; -import com.osmand.views.POIMapLayer; -import com.osmand.views.PointLocationLayer; -import com.osmand.views.PointNavigationLayer; -import com.osmand.views.RouteInfoLayer; -import com.osmand.views.RouteLayer; -import com.osmand.views.TransportInfoLayer; -import com.osmand.views.TransportStopsLayer; -import com.osmand.views.YandexTrafficLayer; - public class MapActivity extends Activity implements IMapLocationListener, SensorEventListener { private static final String GPS_STATUS_ACTIVITY = "com.eclipsim.gpsstatus2.GPSStatus"; //$NON-NLS-1$ @@ -746,7 +745,7 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso if (wakeLock == null) { PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE); - wakeLock = powerManager.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "com.osmand.map"); //$NON-NLS-1$ + wakeLock = powerManager.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "net.osmand.map"); //$NON-NLS-1$ wakeLock.acquire(); } SharedPreferences prefs = getSharedPreferences(OsmandSettings.SHARED_PREFERENCES_NAME, MODE_WORLD_READABLE); diff --git a/OsmAnd/src/com/osmand/activities/NavigatePointActivity.java b/OsmAnd/src/net/osmand/activities/NavigatePointActivity.java similarity index 94% rename from OsmAnd/src/com/osmand/activities/NavigatePointActivity.java rename to OsmAnd/src/net/osmand/activities/NavigatePointActivity.java index fc7534c37f..5a202abb38 100644 --- a/OsmAnd/src/com/osmand/activities/NavigatePointActivity.java +++ b/OsmAnd/src/net/osmand/activities/NavigatePointActivity.java @@ -1,10 +1,15 @@ -package com.osmand.activities; +package net.osmand.activities; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.text.MessageFormat; import java.util.Locale; +import net.osmand.LogUtil; +import net.osmand.OsmandSettings; +import net.osmand.R; +import net.osmand.osm.LatLon; +import net.osmand.views.OsmandMapTileView; import android.app.Activity; import android.app.Dialog; import android.content.Intent; @@ -17,12 +22,6 @@ import android.widget.RadioButton; import android.widget.RadioGroup; import android.widget.TextView; -import com.osmand.LogUtil; -import com.osmand.OsmandSettings; -import com.osmand.R; -import com.osmand.osm.LatLon; -import com.osmand.views.OsmandMapTileView; - public class NavigatePointActivity extends Activity { Dialog dlg; MapActivity activity; diff --git a/OsmAnd/src/com/osmand/activities/OpeningHoursView.java b/OsmAnd/src/net/osmand/activities/OpeningHoursView.java similarity index 94% rename from OsmAnd/src/com/osmand/activities/OpeningHoursView.java rename to OsmAnd/src/net/osmand/activities/OpeningHoursView.java index 6b336aa635..6e305080a1 100644 --- a/OsmAnd/src/com/osmand/activities/OpeningHoursView.java +++ b/OsmAnd/src/net/osmand/activities/OpeningHoursView.java @@ -1,10 +1,13 @@ -package com.osmand.activities; +package net.osmand.activities; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; import java.util.List; +import net.osmand.R; +import net.osmand.osm.OpeningHoursParser.BasicDayOpeningHourRule; +import net.osmand.osm.OpeningHoursParser.OpeningHoursRule; import android.app.AlertDialog; import android.app.AlertDialog.Builder; import android.content.Context; @@ -22,10 +25,6 @@ import android.widget.TextView; import android.widget.TimePicker; import android.widget.TimePicker.OnTimeChangedListener; -import com.osmand.R; -import com.osmand.osm.OpeningHoursParser.BasicDayOpeningHourRule; -import com.osmand.osm.OpeningHoursParser.OpeningHoursRule; - public class OpeningHoursView { private final Context ctx; diff --git a/OsmAnd/src/com/osmand/activities/OsmandApplication.java b/OsmAnd/src/net/osmand/activities/OsmandApplication.java similarity index 78% rename from OsmAnd/src/com/osmand/activities/OsmandApplication.java rename to OsmAnd/src/net/osmand/activities/OsmandApplication.java index 1cfbe85bd2..dc9e663764 100644 --- a/OsmAnd/src/com/osmand/activities/OsmandApplication.java +++ b/OsmAnd/src/net/osmand/activities/OsmandApplication.java @@ -1,4 +1,4 @@ -package com.osmand.activities; +package net.osmand.activities; import android.app.Application; diff --git a/OsmAnd/src/com/osmand/activities/RouteProvider.java b/OsmAnd/src/net/osmand/activities/RouteProvider.java similarity index 95% rename from OsmAnd/src/com/osmand/activities/RouteProvider.java rename to OsmAnd/src/net/osmand/activities/RouteProvider.java index 5a504230ba..27528e5140 100644 --- a/OsmAnd/src/com/osmand/activities/RouteProvider.java +++ b/OsmAnd/src/net/osmand/activities/RouteProvider.java @@ -1,4 +1,4 @@ -package com.osmand.activities; +package net.osmand.activities; import java.io.IOException; import java.io.InputStreamReader; @@ -14,6 +14,14 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.FactoryConfigurationError; import javax.xml.parsers.ParserConfigurationException; +import net.osmand.LogUtil; +import net.osmand.R; +import net.osmand.OsmandSettings.ApplicationMode; +import net.osmand.activities.RoutingHelper.RouteDirectionInfo; +import net.osmand.activities.RoutingHelper.TurnType; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -24,14 +32,6 @@ import org.xml.sax.SAXException; import android.content.Context; import android.location.Location; -import com.osmand.LogUtil; -import com.osmand.R; -import com.osmand.OsmandSettings.ApplicationMode; -import com.osmand.activities.RoutingHelper.RouteDirectionInfo; -import com.osmand.activities.RoutingHelper.TurnType; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; - public class RouteProvider { private static final org.apache.commons.logging.Log log = LogUtil.getLog(RouteProvider.class); diff --git a/OsmAnd/src/com/osmand/activities/RoutingHelper.java b/OsmAnd/src/net/osmand/activities/RoutingHelper.java similarity index 95% rename from OsmAnd/src/com/osmand/activities/RoutingHelper.java rename to OsmAnd/src/net/osmand/activities/RoutingHelper.java index 02a9652297..49db7f03f9 100644 --- a/OsmAnd/src/com/osmand/activities/RoutingHelper.java +++ b/OsmAnd/src/net/osmand/activities/RoutingHelper.java @@ -1,24 +1,23 @@ -package com.osmand.activities; +package net.osmand.activities; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import net.osmand.LogUtil; +import net.osmand.OsmandSettings; +import net.osmand.R; +import net.osmand.OsmandSettings.ApplicationMode; +import net.osmand.activities.RouteProvider.RouteCalculationResult; +import net.osmand.activities.RouteProvider.RouteService; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; import android.app.Activity; import android.content.Context; import android.location.Location; import android.util.FloatMath; import android.widget.Toast; -import com.osmand.LogUtil; -import com.osmand.OsmandSettings; -import com.osmand.R; -import com.osmand.OsmandSettings.ApplicationMode; -import com.osmand.activities.RouteProvider.RouteCalculationResult; -import com.osmand.activities.RouteProvider.RouteService; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; - public class RoutingHelper { private static final org.apache.commons.logging.Log log = LogUtil.getLog(RoutingHelper.class); diff --git a/OsmAnd/src/com/osmand/activities/SavingTrackHelper.java b/OsmAnd/src/net/osmand/activities/SavingTrackHelper.java similarity index 96% rename from OsmAnd/src/com/osmand/activities/SavingTrackHelper.java rename to OsmAnd/src/net/osmand/activities/SavingTrackHelper.java index 0d47eb737c..dcbcb460c2 100644 --- a/OsmAnd/src/com/osmand/activities/SavingTrackHelper.java +++ b/OsmAnd/src/net/osmand/activities/SavingTrackHelper.java @@ -1,4 +1,4 @@ -package com.osmand.activities; +package net.osmand.activities; import java.io.File; import java.io.FileInputStream; @@ -11,6 +11,11 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import net.osmand.LogUtil; +import net.osmand.OsmandSettings; +import net.osmand.R; +import net.osmand.Version; + import org.apache.commons.logging.Log; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -25,11 +30,6 @@ import android.text.format.DateFormat; import android.util.Xml; import android.widget.Toast; -import com.osmand.LogUtil; -import com.osmand.OsmandSettings; -import com.osmand.R; -import com.osmand.Version; - public class SavingTrackHelper extends SQLiteOpenHelper { public final static String TRACKS_PATH = "tracks"; //$NON-NLS-1$ diff --git a/OsmAnd/src/com/osmand/activities/SettingsActivity.java b/OsmAnd/src/net/osmand/activities/SettingsActivity.java similarity index 95% rename from OsmAnd/src/com/osmand/activities/SettingsActivity.java rename to OsmAnd/src/net/osmand/activities/SettingsActivity.java index 55b9362a50..2507d63af0 100644 --- a/OsmAnd/src/com/osmand/activities/SettingsActivity.java +++ b/OsmAnd/src/net/osmand/activities/SettingsActivity.java @@ -1,4 +1,4 @@ -package com.osmand.activities; +package net.osmand.activities; import java.io.File; import java.util.LinkedHashMap; @@ -7,6 +7,18 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.osmand.NavigationService; +import net.osmand.OsmandSettings; +import net.osmand.PoiFiltersHelper; +import net.osmand.ProgressDialogImplementation; +import net.osmand.R; +import net.osmand.ResourceManager; +import net.osmand.SQLiteTileSource; +import net.osmand.OsmandSettings.ApplicationMode; +import net.osmand.activities.RouteProvider.RouteService; +import net.osmand.map.TileSourceManager; +import net.osmand.map.TileSourceManager.TileSourceTemplate; +import net.osmand.voice.CommandPlayer; import android.app.ProgressDialog; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -30,19 +42,6 @@ import android.preference.Preference.OnPreferenceChangeListener; import android.preference.Preference.OnPreferenceClickListener; import android.widget.Toast; -import com.osmand.NavigationService; -import com.osmand.OsmandSettings; -import com.osmand.PoiFiltersHelper; -import com.osmand.ProgressDialogImplementation; -import com.osmand.R; -import com.osmand.ResourceManager; -import com.osmand.SQLiteTileSource; -import com.osmand.OsmandSettings.ApplicationMode; -import com.osmand.activities.RouteProvider.RouteService; -import com.osmand.map.TileSourceManager; -import com.osmand.map.TileSourceManager.TileSourceTemplate; -import com.osmand.voice.CommandPlayer; - public class SettingsActivity extends PreferenceActivity implements OnPreferenceChangeListener, OnPreferenceClickListener { private class BooleanPreference { diff --git a/OsmAnd/src/com/osmand/activities/ShowRouteInfoActivity.java b/OsmAnd/src/net/osmand/activities/ShowRouteInfoActivity.java similarity index 91% rename from OsmAnd/src/com/osmand/activities/ShowRouteInfoActivity.java rename to OsmAnd/src/net/osmand/activities/ShowRouteInfoActivity.java index dccb48f574..120006fc6b 100644 --- a/OsmAnd/src/com/osmand/activities/ShowRouteInfoActivity.java +++ b/OsmAnd/src/net/osmand/activities/ShowRouteInfoActivity.java @@ -1,11 +1,17 @@ /** * */ -package com.osmand.activities; +package net.osmand.activities; import java.text.MessageFormat; import java.util.List; +import net.osmand.OsmandSettings; +import net.osmand.R; +import net.osmand.activities.RoutingHelper.RouteDirectionInfo; +import net.osmand.activities.RoutingHelper.TurnType; +import net.osmand.osm.MapUtils; +import net.osmand.views.MapInfoLayer; import android.app.ListActivity; import android.content.Intent; import android.graphics.Canvas; @@ -28,13 +34,6 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; -import com.osmand.OsmandSettings; -import com.osmand.R; -import com.osmand.activities.RoutingHelper.RouteDirectionInfo; -import com.osmand.activities.RoutingHelper.TurnType; -import com.osmand.osm.MapUtils; -import com.osmand.views.MapInfoLayer; - /** * */ diff --git a/OsmAnd/src/com/osmand/activities/TransportRouteHelper.java b/OsmAnd/src/net/osmand/activities/TransportRouteHelper.java similarity index 83% rename from OsmAnd/src/com/osmand/activities/TransportRouteHelper.java rename to OsmAnd/src/net/osmand/activities/TransportRouteHelper.java index 855e4d7bf2..de7da4d868 100644 --- a/OsmAnd/src/com/osmand/activities/TransportRouteHelper.java +++ b/OsmAnd/src/net/osmand/activities/TransportRouteHelper.java @@ -1,9 +1,10 @@ -package com.osmand.activities; +package net.osmand.activities; import java.util.ArrayList; import java.util.List; -import com.osmand.TransportIndexRepository.RouteInfoLocation; +import net.osmand.TransportIndexRepository.RouteInfoLocation; + public class TransportRouteHelper { private static TransportRouteHelper inst = new TransportRouteHelper(); diff --git a/OsmAnd/src/com/osmand/activities/VoiceRouter.java b/OsmAnd/src/net/osmand/activities/VoiceRouter.java similarity index 93% rename from OsmAnd/src/com/osmand/activities/VoiceRouter.java rename to OsmAnd/src/net/osmand/activities/VoiceRouter.java index c26fb9b27f..e7080de158 100644 --- a/OsmAnd/src/com/osmand/activities/VoiceRouter.java +++ b/OsmAnd/src/net/osmand/activities/VoiceRouter.java @@ -1,12 +1,12 @@ -package com.osmand.activities; +package net.osmand.activities; +import net.osmand.OsmandSettings.ApplicationMode; +import net.osmand.activities.RoutingHelper.RouteDirectionInfo; +import net.osmand.activities.RoutingHelper.TurnType; +import net.osmand.voice.CommandPlayer; +import net.osmand.voice.CommandPlayer.CommandBuilder; import android.content.Context; -import com.osmand.OsmandSettings.ApplicationMode; -import com.osmand.activities.RoutingHelper.RouteDirectionInfo; -import com.osmand.activities.RoutingHelper.TurnType; -import com.osmand.voice.CommandPlayer; -import com.osmand.voice.CommandPlayer.CommandBuilder; public class VoiceRouter { // 0 - unknown, 1 - notify prepare, 2 - notify to turn after , 3 - notify to turn diff --git a/OsmAnd/src/com/osmand/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/activities/search/SearchActivity.java similarity index 91% rename from OsmAnd/src/com/osmand/activities/search/SearchActivity.java rename to OsmAnd/src/net/osmand/activities/search/SearchActivity.java index 90e97b5054..2be13b57f3 100644 --- a/OsmAnd/src/com/osmand/activities/search/SearchActivity.java +++ b/OsmAnd/src/net/osmand/activities/search/SearchActivity.java @@ -1,8 +1,10 @@ /** * */ -package com.osmand.activities.search; +package net.osmand.activities.search; +import net.osmand.R; +import net.osmand.activities.NavigatePointActivity; import android.app.TabActivity; import android.content.Intent; import android.os.Bundle; @@ -10,8 +12,6 @@ import android.widget.Button; import android.widget.TabHost; import android.widget.TabHost.TabSpec; -import com.osmand.R; -import com.osmand.activities.NavigatePointActivity; /** * @author Maxim Frolov diff --git a/OsmAnd/src/com/osmand/activities/search/SearchAddressActivity.java b/OsmAnd/src/net/osmand/activities/search/SearchAddressActivity.java similarity index 93% rename from OsmAnd/src/com/osmand/activities/search/SearchAddressActivity.java rename to OsmAnd/src/net/osmand/activities/search/SearchAddressActivity.java index 91acd59d5d..070e4e5e1d 100644 --- a/OsmAnd/src/com/osmand/activities/search/SearchAddressActivity.java +++ b/OsmAnd/src/net/osmand/activities/search/SearchAddressActivity.java @@ -1,8 +1,21 @@ -package com.osmand.activities.search; +package net.osmand.activities.search; import java.text.MessageFormat; +import net.osmand.OsmandSettings; +import net.osmand.R; +import net.osmand.RegionAddressRepository; +import net.osmand.ResourceManager; +import net.osmand.activities.MapActivity; +import net.osmand.data.Building; +import net.osmand.data.City; +import net.osmand.data.MapObject; +import net.osmand.data.PostCode; +import net.osmand.data.Street; +import net.osmand.osm.LatLon; +import net.osmand.osm.Node; +import net.osmand.osm.Way; import android.app.Activity; import android.app.ProgressDialog; import android.content.Intent; @@ -14,20 +27,6 @@ import android.widget.RadioButton; import android.widget.RadioGroup; import android.widget.TextView; -import com.osmand.OsmandSettings; -import com.osmand.R; -import com.osmand.RegionAddressRepository; -import com.osmand.ResourceManager; -import com.osmand.activities.MapActivity; -import com.osmand.data.Building; -import com.osmand.data.City; -import com.osmand.data.MapObject; -import com.osmand.data.PostCode; -import com.osmand.data.Street; -import com.osmand.osm.LatLon; -import com.osmand.osm.Node; -import com.osmand.osm.Way; - public class SearchAddressActivity extends Activity { private Button showOnMap; diff --git a/OsmAnd/src/com/osmand/activities/search/SearchAddressOnlineActivity.java b/OsmAnd/src/net/osmand/activities/search/SearchAddressOnlineActivity.java similarity index 92% rename from OsmAnd/src/com/osmand/activities/search/SearchAddressOnlineActivity.java rename to OsmAnd/src/net/osmand/activities/search/SearchAddressOnlineActivity.java index 6745d04393..ff068424a6 100644 --- a/OsmAnd/src/com/osmand/activities/search/SearchAddressOnlineActivity.java +++ b/OsmAnd/src/net/osmand/activities/search/SearchAddressOnlineActivity.java @@ -1,4 +1,4 @@ -package com.osmand.activities.search; +package net.osmand.activities.search; import java.io.InputStream; import java.net.URL; @@ -8,6 +8,15 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; +import net.osmand.Algoritms; +import net.osmand.LogUtil; +import net.osmand.OsmandSettings; +import net.osmand.R; +import net.osmand.Version; +import net.osmand.activities.MapActivity; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; + import org.apache.commons.logging.Log; import org.xmlpull.v1.XmlPullParser; @@ -26,15 +35,6 @@ import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; -import com.osmand.Algoritms; -import com.osmand.LogUtil; -import com.osmand.OsmandSettings; -import com.osmand.R; -import com.osmand.Version; -import com.osmand.activities.MapActivity; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; - public class SearchAddressOnlineActivity extends ListActivity { private LatLon location; diff --git a/OsmAnd/src/com/osmand/activities/search/SearchBuildingByNameActivity.java b/OsmAnd/src/net/osmand/activities/search/SearchBuildingByNameActivity.java similarity index 81% rename from OsmAnd/src/com/osmand/activities/search/SearchBuildingByNameActivity.java rename to OsmAnd/src/net/osmand/activities/search/SearchBuildingByNameActivity.java index 424a1ee2ca..775afe4666 100644 --- a/OsmAnd/src/com/osmand/activities/search/SearchBuildingByNameActivity.java +++ b/OsmAnd/src/net/osmand/activities/search/SearchBuildingByNameActivity.java @@ -1,20 +1,19 @@ -package com.osmand.activities.search; +package net.osmand.activities.search; import java.util.ArrayList; import java.util.List; +import net.osmand.OsmandSettings; +import net.osmand.R; +import net.osmand.RegionAddressRepository; +import net.osmand.ResourceManager; +import net.osmand.data.Building; +import net.osmand.data.City; +import net.osmand.data.PostCode; +import net.osmand.data.Street; import android.os.Bundle; import android.widget.TextView; -import com.osmand.OsmandSettings; -import com.osmand.R; -import com.osmand.RegionAddressRepository; -import com.osmand.ResourceManager; -import com.osmand.data.Building; -import com.osmand.data.City; -import com.osmand.data.PostCode; -import com.osmand.data.Street; - public class SearchBuildingByNameActivity extends SearchByNameAbstractActivity { private RegionAddressRepository region; private City city; diff --git a/OsmAnd/src/com/osmand/activities/search/SearchByNameAbstractActivity.java b/OsmAnd/src/net/osmand/activities/search/SearchByNameAbstractActivity.java similarity index 94% rename from OsmAnd/src/com/osmand/activities/search/SearchByNameAbstractActivity.java rename to OsmAnd/src/net/osmand/activities/search/SearchByNameAbstractActivity.java index 8cd43011d5..f15d84b646 100644 --- a/OsmAnd/src/com/osmand/activities/search/SearchByNameAbstractActivity.java +++ b/OsmAnd/src/net/osmand/activities/search/SearchByNameAbstractActivity.java @@ -1,7 +1,8 @@ -package com.osmand.activities.search; +package net.osmand.activities.search; import java.util.List; +import net.osmand.R; import android.app.ListActivity; import android.os.Bundle; import android.os.Handler; @@ -19,7 +20,6 @@ import android.widget.ListView; import android.widget.ProgressBar; import android.widget.TextView; -import com.osmand.R; public abstract class SearchByNameAbstractActivity extends ListActivity { diff --git a/OsmAnd/src/com/osmand/activities/search/SearchCityByNameActivity.java b/OsmAnd/src/net/osmand/activities/search/SearchCityByNameActivity.java similarity index 80% rename from OsmAnd/src/com/osmand/activities/search/SearchCityByNameActivity.java rename to OsmAnd/src/net/osmand/activities/search/SearchCityByNameActivity.java index 62fd409ce1..89837b3d84 100644 --- a/OsmAnd/src/com/osmand/activities/search/SearchCityByNameActivity.java +++ b/OsmAnd/src/net/osmand/activities/search/SearchCityByNameActivity.java @@ -1,21 +1,20 @@ -package com.osmand.activities.search; +package net.osmand.activities.search; import java.util.ArrayList; import java.util.List; +import net.osmand.OsmandSettings; +import net.osmand.R; +import net.osmand.RegionAddressRepository; +import net.osmand.ResourceManager; +import net.osmand.data.City; +import net.osmand.data.MapObject; +import net.osmand.data.PostCode; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; import android.os.Bundle; import android.widget.TextView; -import com.osmand.OsmandSettings; -import com.osmand.R; -import com.osmand.RegionAddressRepository; -import com.osmand.ResourceManager; -import com.osmand.data.City; -import com.osmand.data.MapObject; -import com.osmand.data.PostCode; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; - public class SearchCityByNameActivity extends SearchByNameAbstractActivity { private RegionAddressRepository region; private LatLon location; diff --git a/OsmAnd/src/com/osmand/activities/search/SearchHistoryActivity.java b/OsmAnd/src/net/osmand/activities/search/SearchHistoryActivity.java similarity index 90% rename from OsmAnd/src/com/osmand/activities/search/SearchHistoryActivity.java rename to OsmAnd/src/net/osmand/activities/search/SearchHistoryActivity.java index 3404b2453c..9b67d10ba5 100644 --- a/OsmAnd/src/com/osmand/activities/search/SearchHistoryActivity.java +++ b/OsmAnd/src/net/osmand/activities/search/SearchHistoryActivity.java @@ -1,7 +1,13 @@ -package com.osmand.activities.search; +package net.osmand.activities.search; import java.util.List; +import net.osmand.OsmandSettings; +import net.osmand.R; +import net.osmand.activities.MapActivity; +import net.osmand.activities.search.SearchHistoryHelper.HistoryEntry; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; import android.app.ListActivity; import android.content.Intent; import android.os.Bundle; @@ -14,13 +20,6 @@ import android.widget.ImageButton; import android.widget.ListView; import android.widget.TextView; -import com.osmand.OsmandSettings; -import com.osmand.R; -import com.osmand.activities.MapActivity; -import com.osmand.activities.search.SearchHistoryHelper.HistoryEntry; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; - public class SearchHistoryActivity extends ListActivity { private LatLon location; private SearchHistoryHelper helper; diff --git a/OsmAnd/src/com/osmand/activities/search/SearchHistoryHelper.java b/OsmAnd/src/net/osmand/activities/search/SearchHistoryHelper.java similarity index 96% rename from OsmAnd/src/com/osmand/activities/search/SearchHistoryHelper.java rename to OsmAnd/src/net/osmand/activities/search/SearchHistoryHelper.java index bf812f33aa..e7c62f5ffc 100644 --- a/OsmAnd/src/com/osmand/activities/search/SearchHistoryHelper.java +++ b/OsmAnd/src/net/osmand/activities/search/SearchHistoryHelper.java @@ -1,4 +1,4 @@ -package com.osmand.activities.search; +package net.osmand.activities.search; import java.util.ArrayList; import java.util.List; diff --git a/OsmAnd/src/com/osmand/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/activities/search/SearchPOIActivity.java similarity index 93% rename from OsmAnd/src/com/osmand/activities/search/SearchPOIActivity.java rename to OsmAnd/src/net/osmand/activities/search/SearchPOIActivity.java index 92f08542f3..cbb8923f16 100644 --- a/OsmAnd/src/com/osmand/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/activities/search/SearchPOIActivity.java @@ -1,12 +1,25 @@ /** * */ -package com.osmand.activities.search; +package net.osmand.activities.search; import java.util.ArrayList; import java.util.Calendar; import java.util.List; +import net.osmand.Algoritms; +import net.osmand.LogUtil; +import net.osmand.NameFinderPoiFilter; +import net.osmand.OsmandSettings; +import net.osmand.PoiFilter; +import net.osmand.PoiFiltersHelper; +import net.osmand.R; +import net.osmand.activities.MapActivity; +import net.osmand.data.Amenity; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; +import net.osmand.osm.OpeningHoursParser; +import net.osmand.osm.OpeningHoursParser.OpeningHoursRule; import android.app.ListActivity; import android.content.Intent; import android.content.pm.ActivityInfo; @@ -47,29 +60,15 @@ import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; -import com.osmand.Algoritms; -import com.osmand.LogUtil; -import com.osmand.NameFinderPoiFilter; -import com.osmand.OsmandSettings; -import com.osmand.PoiFilter; -import com.osmand.PoiFiltersHelper; -import com.osmand.R; -import com.osmand.activities.MapActivity; -import com.osmand.data.Amenity; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; -import com.osmand.osm.OpeningHoursParser; -import com.osmand.osm.OpeningHoursParser.OpeningHoursRule; - /** * @author Maxim Frolov * */ public class SearchPOIActivity extends ListActivity implements SensorEventListener { - public static final String AMENITY_FILTER = "com.osmand.amenity_filter"; //$NON-NLS-1$ - public static final String SEARCH_LAT = "com.osmand.am_search_lat"; //$NON-NLS-1$ - public static final String SEARCH_LON = "com.osmand.am_search_lon"; //$NON-NLS-1$ + public static final String AMENITY_FILTER = "net.osmand.amenity_filter"; //$NON-NLS-1$ + public static final String SEARCH_LAT = "net.osmand.am_search_lat"; //$NON-NLS-1$ + public static final String SEARCH_LON = "net.osmand.am_search_lon"; //$NON-NLS-1$ private static final int GPS_TIMEOUT_REQUEST = 1000; private static final int GPS_DIST_REQUEST = 5; private static final int MIN_DISTANCE_TO_RESEARCH = 70; diff --git a/OsmAnd/src/com/osmand/activities/search/SearchPoiFilterActivity.java b/OsmAnd/src/net/osmand/activities/search/SearchPoiFilterActivity.java similarity index 92% rename from OsmAnd/src/com/osmand/activities/search/SearchPoiFilterActivity.java rename to OsmAnd/src/net/osmand/activities/search/SearchPoiFilterActivity.java index ed9226a688..e932843f69 100644 --- a/OsmAnd/src/com/osmand/activities/search/SearchPoiFilterActivity.java +++ b/OsmAnd/src/net/osmand/activities/search/SearchPoiFilterActivity.java @@ -1,11 +1,16 @@ /** * */ -package com.osmand.activities.search; +package net.osmand.activities.search; import java.util.ArrayList; import java.util.List; +import net.osmand.NameFinderPoiFilter; +import net.osmand.PoiFilter; +import net.osmand.PoiFiltersHelper; +import net.osmand.R; +import net.osmand.activities.EditPOIFilterActivity; import android.app.ListActivity; import android.content.Intent; import android.graphics.Typeface; @@ -19,11 +24,6 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; -import com.osmand.NameFinderPoiFilter; -import com.osmand.PoiFilter; -import com.osmand.PoiFiltersHelper; -import com.osmand.R; -import com.osmand.activities.EditPOIFilterActivity; /** * @author Maxim Frolov diff --git a/OsmAnd/src/com/osmand/activities/search/SearchRegionByNameActivity.java b/OsmAnd/src/net/osmand/activities/search/SearchRegionByNameActivity.java similarity index 83% rename from OsmAnd/src/com/osmand/activities/search/SearchRegionByNameActivity.java rename to OsmAnd/src/net/osmand/activities/search/SearchRegionByNameActivity.java index 035d007eaa..12af3c8168 100644 --- a/OsmAnd/src/com/osmand/activities/search/SearchRegionByNameActivity.java +++ b/OsmAnd/src/net/osmand/activities/search/SearchRegionByNameActivity.java @@ -1,16 +1,16 @@ -package com.osmand.activities.search; +package net.osmand.activities.search; import java.util.ArrayList; import java.util.List; +import net.osmand.OsmandSettings; +import net.osmand.R; +import net.osmand.RegionAddressRepository; +import net.osmand.ResourceManager; import android.os.Bundle; import android.widget.TextView; import android.widget.Toast; -import com.osmand.OsmandSettings; -import com.osmand.R; -import com.osmand.RegionAddressRepository; -import com.osmand.ResourceManager; public class SearchRegionByNameActivity extends SearchByNameAbstractActivity { diff --git a/OsmAnd/src/com/osmand/activities/search/SearchStreet2ByNameActivity.java b/OsmAnd/src/net/osmand/activities/search/SearchStreet2ByNameActivity.java similarity index 88% rename from OsmAnd/src/com/osmand/activities/search/SearchStreet2ByNameActivity.java rename to OsmAnd/src/net/osmand/activities/search/SearchStreet2ByNameActivity.java index 68def0e4b2..b8da8c927c 100644 --- a/OsmAnd/src/com/osmand/activities/search/SearchStreet2ByNameActivity.java +++ b/OsmAnd/src/net/osmand/activities/search/SearchStreet2ByNameActivity.java @@ -1,20 +1,19 @@ -package com.osmand.activities.search; +package net.osmand.activities.search; import java.util.ArrayList; import java.util.List; +import net.osmand.OsmandSettings; +import net.osmand.R; +import net.osmand.RegionAddressRepository; +import net.osmand.ResourceManager; +import net.osmand.data.City; +import net.osmand.data.PostCode; +import net.osmand.data.Street; import android.app.ProgressDialog; import android.os.Bundle; import android.widget.TextView; -import com.osmand.OsmandSettings; -import com.osmand.R; -import com.osmand.RegionAddressRepository; -import com.osmand.ResourceManager; -import com.osmand.data.City; -import com.osmand.data.PostCode; -import com.osmand.data.Street; - public class SearchStreet2ByNameActivity extends SearchByNameAbstractActivity { private RegionAddressRepository region; private City city; diff --git a/OsmAnd/src/com/osmand/activities/search/SearchStreetByNameActivity.java b/OsmAnd/src/net/osmand/activities/search/SearchStreetByNameActivity.java similarity index 80% rename from OsmAnd/src/com/osmand/activities/search/SearchStreetByNameActivity.java rename to OsmAnd/src/net/osmand/activities/search/SearchStreetByNameActivity.java index 37ce179d58..d8cea8bece 100644 --- a/OsmAnd/src/com/osmand/activities/search/SearchStreetByNameActivity.java +++ b/OsmAnd/src/net/osmand/activities/search/SearchStreetByNameActivity.java @@ -1,19 +1,18 @@ -package com.osmand.activities.search; +package net.osmand.activities.search; import java.util.ArrayList; import java.util.List; +import net.osmand.OsmandSettings; +import net.osmand.R; +import net.osmand.RegionAddressRepository; +import net.osmand.ResourceManager; +import net.osmand.data.City; +import net.osmand.data.PostCode; +import net.osmand.data.Street; import android.os.Bundle; import android.widget.TextView; -import com.osmand.OsmandSettings; -import com.osmand.R; -import com.osmand.RegionAddressRepository; -import com.osmand.ResourceManager; -import com.osmand.data.City; -import com.osmand.data.PostCode; -import com.osmand.data.Street; - public class SearchStreetByNameActivity extends SearchByNameAbstractActivity { private RegionAddressRepository region; private City city; diff --git a/OsmAnd/src/com/osmand/activities/search/SearchTransportActivity.java b/OsmAnd/src/net/osmand/activities/search/SearchTransportActivity.java similarity index 94% rename from OsmAnd/src/com/osmand/activities/search/SearchTransportActivity.java rename to OsmAnd/src/net/osmand/activities/search/SearchTransportActivity.java index d82140d324..054c15b2f7 100644 --- a/OsmAnd/src/com/osmand/activities/search/SearchTransportActivity.java +++ b/OsmAnd/src/net/osmand/activities/search/SearchTransportActivity.java @@ -1,12 +1,24 @@ /** * */ -package com.osmand.activities.search; +package net.osmand.activities.search; import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; +import net.osmand.Algoritms; +import net.osmand.Messages; +import net.osmand.OsmandSettings; +import net.osmand.R; +import net.osmand.ResourceManager; +import net.osmand.TransportIndexRepository; +import net.osmand.TransportIndexRepository.RouteInfoLocation; +import net.osmand.activities.TransportRouteHelper; +import net.osmand.data.TransportRoute; +import net.osmand.data.TransportStop; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; import android.app.AlertDialog; import android.app.ListActivity; import android.app.AlertDialog.Builder; @@ -25,19 +37,6 @@ import android.widget.ListView; import android.widget.ProgressBar; import android.widget.TextView; -import com.osmand.Algoritms; -import com.osmand.Messages; -import com.osmand.OsmandSettings; -import com.osmand.R; -import com.osmand.ResourceManager; -import com.osmand.TransportIndexRepository; -import com.osmand.TransportIndexRepository.RouteInfoLocation; -import com.osmand.activities.TransportRouteHelper; -import com.osmand.data.TransportRoute; -import com.osmand.data.TransportStop; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; - /** * @author Maxim Frolov * diff --git a/OsmAnd/src/com/osmand/render/RenderMapsRepositories.java b/OsmAnd/src/net/osmand/render/RenderMapsRepositories.java similarity index 84% rename from OsmAnd/src/com/osmand/render/RenderMapsRepositories.java rename to OsmAnd/src/net/osmand/render/RenderMapsRepositories.java index c5a437cb45..1661240849 100644 --- a/OsmAnd/src/com/osmand/render/RenderMapsRepositories.java +++ b/OsmAnd/src/net/osmand/render/RenderMapsRepositories.java @@ -1,20 +1,19 @@ -package com.osmand.render; +package net.osmand.render; import java.io.File; import java.util.LinkedList; import java.util.List; +import net.osmand.IProgress; +import net.osmand.LogUtil; +import net.osmand.data.index.IndexConstants; +import net.osmand.osm.Node; +import net.osmand.osm.Way; + import org.apache.commons.logging.Log; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import android.database.sqlite.SQLiteStatement; - -import com.osmand.IProgress; -import com.osmand.LogUtil; -import com.osmand.data.index.IndexConstants; -import com.osmand.osm.Node; -import com.osmand.osm.Way; public class RenderMapsRepositories { @@ -80,13 +79,13 @@ public class RenderMapsRepositories { cRightLongitude = rightLongitude + (rightLongitude - leftLongitude); cZoom = zoom; - String query = "SELECT ways.id way, node.id node, node.latitude, node.longitude FROM (" + - "SELECT DISTINCT ways.id id FROM ways JOIN " + - "(SELECT id, latitude, longitude FROM node WHERE ?< latitude AND latitude < ? AND ? < longitude AND longitude < ?) A "+ - "ON A.id = ways.node) B "+ - "JOIN ways ON B.id=ways.id JOIN node ON ways.node = node.id"; + String query = "SELECT ways.id way, node.id node, node.latitude, node.longitude FROM (" + //$NON-NLS-1$ + "SELECT DISTINCT ways.id id FROM ways JOIN " + //$NON-NLS-1$ + "(SELECT id, latitude, longitude FROM node WHERE ?< latitude AND latitude < ? AND ? < longitude AND longitude < ?) A "+ //$NON-NLS-1$ + "ON A.id = ways.node) B "+ //$NON-NLS-1$ + "JOIN ways ON B.id=ways.id JOIN node ON ways.node = node.id"; //$NON-NLS-1$ - log.info(String.format("BLat=%s, TLat=%s, LLong=%s, RLong=%s, zoom=%s", cBottomLatitude, cTopLatitude, cLeftLongitude, cRightLongitude, zoom)); + log.info(String.format("BLat=%s, TLat=%s, LLong=%s, RLong=%s, zoom=%s", cBottomLatitude, cTopLatitude, cLeftLongitude, cRightLongitude, zoom)); //$NON-NLS-1$ long now = System.currentTimeMillis(); @@ -116,7 +115,7 @@ public class RenderMapsRepositories { cWays = local; } - log.info(String.format("Search has been done in %s ms. %s results were found.", System.currentTimeMillis()-now, count)); + log.info(String.format("Search has been done in %s ms. %s results were found.", System.currentTimeMillis()-now, count)); //$NON-NLS-1$ } finally { result.close(); } @@ -124,11 +123,6 @@ public class RenderMapsRepositories { } - - private void addToCache(Way way) { - cWays.add(way); - } - public void clearCache() { cWays.clear(); } diff --git a/OsmAnd/src/com/osmand/render/RendererLayer.java b/OsmAnd/src/net/osmand/render/RendererLayer.java similarity index 90% rename from OsmAnd/src/com/osmand/render/RendererLayer.java rename to OsmAnd/src/net/osmand/render/RendererLayer.java index 49da404733..a89d2d05ae 100644 --- a/OsmAnd/src/com/osmand/render/RendererLayer.java +++ b/OsmAnd/src/net/osmand/render/RendererLayer.java @@ -1,7 +1,11 @@ -package com.osmand.render; - -import java.util.List; +package net.osmand.render; +import net.osmand.ResourceManager; +import net.osmand.osm.MapUtils; +import net.osmand.osm.Node; +import net.osmand.osm.Way; +import net.osmand.views.OsmandMapLayer; +import net.osmand.views.OsmandMapTileView; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; @@ -11,13 +15,6 @@ import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Paint.Style; -import com.osmand.ResourceManager; -import com.osmand.osm.MapUtils; -import com.osmand.osm.Node; -import com.osmand.osm.Way; -import com.osmand.views.OsmandMapLayer; -import com.osmand.views.OsmandMapTileView; - public class RendererLayer implements OsmandMapLayer { private OsmandMapTileView view; diff --git a/OsmAnd/src/com/osmand/views/AnimateDraggingMapThread.java b/OsmAnd/src/net/osmand/views/AnimateDraggingMapThread.java similarity index 95% rename from OsmAnd/src/com/osmand/views/AnimateDraggingMapThread.java rename to OsmAnd/src/net/osmand/views/AnimateDraggingMapThread.java index da96d4a17f..832b75c699 100644 --- a/OsmAnd/src/com/osmand/views/AnimateDraggingMapThread.java +++ b/OsmAnd/src/net/osmand/views/AnimateDraggingMapThread.java @@ -1,9 +1,8 @@ -package com.osmand.views; +package net.osmand.views; +import net.osmand.osm.MapUtils; import android.util.FloatMath; -import com.osmand.osm.MapUtils; - /** * Thread for animated dragging. * Defines accelerator to stop dragging screen. diff --git a/OsmAnd/src/com/osmand/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/views/ContextMenuLayer.java similarity index 94% rename from OsmAnd/src/com/osmand/views/ContextMenuLayer.java rename to OsmAnd/src/net/osmand/views/ContextMenuLayer.java index 2d01b41b43..bb3b23fcb7 100644 --- a/OsmAnd/src/com/osmand/views/ContextMenuLayer.java +++ b/OsmAnd/src/net/osmand/views/ContextMenuLayer.java @@ -1,9 +1,12 @@ -package com.osmand.views; +package net.osmand.views; import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; +import net.osmand.R; +import net.osmand.activities.MapActivity; +import net.osmand.osm.LatLon; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; @@ -19,10 +22,6 @@ import android.view.WindowManager; import android.widget.TextView; import android.widget.FrameLayout.LayoutParams; -import com.osmand.R; -import com.osmand.activities.MapActivity; -import com.osmand.osm.LatLon; - public class ContextMenuLayer implements OsmandMapLayer { public interface IContextMenuProvider { diff --git a/OsmAnd/src/com/osmand/views/FavoritesLayer.java b/OsmAnd/src/net/osmand/views/FavoritesLayer.java similarity index 91% rename from OsmAnd/src/com/osmand/views/FavoritesLayer.java rename to OsmAnd/src/net/osmand/views/FavoritesLayer.java index 8bff3e5394..cd005c5258 100644 --- a/OsmAnd/src/com/osmand/views/FavoritesLayer.java +++ b/OsmAnd/src/net/osmand/views/FavoritesLayer.java @@ -1,7 +1,13 @@ -package com.osmand.views; +package net.osmand.views; import java.util.List; +import net.osmand.R; +import net.osmand.activities.FavouritesActivity; +import net.osmand.activities.FavouritesActivity.FavouritePoint; +import net.osmand.activities.FavouritesActivity.FavouritesDbHelper; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; import android.content.Context; import android.content.DialogInterface.OnClickListener; import android.graphics.Canvas; @@ -17,13 +23,6 @@ import android.util.FloatMath; import android.view.WindowManager; import android.widget.Toast; -import com.osmand.R; -import com.osmand.activities.FavouritesActivity; -import com.osmand.activities.FavouritesActivity.FavouritePoint; -import com.osmand.activities.FavouritesActivity.FavouritesDbHelper; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; - public class FavoritesLayer implements OsmandMapLayer, ContextMenuLayer.IContextMenuProvider { private static final int startZoom = 6; diff --git a/OsmAnd/src/com/osmand/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/views/MapInfoLayer.java similarity index 95% rename from OsmAnd/src/com/osmand/views/MapInfoLayer.java rename to OsmAnd/src/net/osmand/views/MapInfoLayer.java index 2c71419f32..1a605370a7 100644 --- a/OsmAnd/src/com/osmand/views/MapInfoLayer.java +++ b/OsmAnd/src/net/osmand/views/MapInfoLayer.java @@ -1,5 +1,14 @@ -package com.osmand.views; +package net.osmand.views; +import net.osmand.Algoritms; +import net.osmand.Messages; +import net.osmand.OsmandSettings; +import net.osmand.R; +import net.osmand.activities.MapActivity; +import net.osmand.activities.RoutingHelper.RouteDirectionInfo; +import net.osmand.activities.RoutingHelper.TurnType; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; import android.content.Context; import android.graphics.Canvas; import android.graphics.Color; @@ -18,16 +27,6 @@ import android.util.FloatMath; import android.view.View; import android.view.WindowManager; -import com.osmand.Algoritms; -import com.osmand.Messages; -import com.osmand.OsmandSettings; -import com.osmand.R; -import com.osmand.activities.MapActivity; -import com.osmand.activities.RoutingHelper.RouteDirectionInfo; -import com.osmand.activities.RoutingHelper.TurnType; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; - public class MapInfoLayer implements OsmandMapLayer { diff --git a/OsmAnd/src/com/osmand/views/MultiTouchSupport.java b/OsmAnd/src/net/osmand/views/MultiTouchSupport.java similarity index 95% rename from OsmAnd/src/com/osmand/views/MultiTouchSupport.java rename to OsmAnd/src/net/osmand/views/MultiTouchSupport.java index ec18662451..6b072f01d7 100644 --- a/OsmAnd/src/com/osmand/views/MultiTouchSupport.java +++ b/OsmAnd/src/net/osmand/views/MultiTouchSupport.java @@ -1,7 +1,9 @@ -package com.osmand.views; +package net.osmand.views; import java.lang.reflect.Method; +import net.osmand.LogUtil; + import org.apache.commons.logging.Log; import android.content.Context; @@ -9,7 +11,6 @@ import android.graphics.PointF; import android.util.FloatMath; import android.view.MotionEvent; -import com.osmand.LogUtil; public class MultiTouchSupport { diff --git a/OsmAnd/src/com/osmand/views/OsmBugsLayer.java b/OsmAnd/src/net/osmand/views/OsmBugsLayer.java similarity index 96% rename from OsmAnd/src/com/osmand/views/OsmBugsLayer.java rename to OsmAnd/src/net/osmand/views/OsmBugsLayer.java index e583137b33..0a36f27432 100644 --- a/OsmAnd/src/com/osmand/views/OsmBugsLayer.java +++ b/OsmAnd/src/net/osmand/views/OsmBugsLayer.java @@ -1,4 +1,4 @@ -package com.osmand.views; +package net.osmand.views; import java.io.BufferedReader; import java.io.IOException; @@ -11,6 +11,12 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import net.osmand.LogUtil; +import net.osmand.OsmandSettings; +import net.osmand.R; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; + import org.apache.commons.logging.Log; import android.app.Activity; @@ -35,12 +41,6 @@ import android.view.WindowManager; import android.widget.EditText; import android.widget.Toast; -import com.osmand.LogUtil; -import com.osmand.OsmandSettings; -import com.osmand.R; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; - public class OsmBugsLayer implements OsmandMapLayer, ContextMenuLayer.IContextMenuProvider { private static final Log log = LogUtil.getLog(OsmBugsLayer.class); diff --git a/OsmAnd/src/com/osmand/views/OsmZoomControls.java b/OsmAnd/src/net/osmand/views/OsmZoomControls.java similarity index 93% rename from OsmAnd/src/com/osmand/views/OsmZoomControls.java rename to OsmAnd/src/net/osmand/views/OsmZoomControls.java index 6826cb8cf2..a37ddf89af 100644 --- a/OsmAnd/src/com/osmand/views/OsmZoomControls.java +++ b/OsmAnd/src/net/osmand/views/OsmZoomControls.java @@ -1,4 +1,4 @@ -package com.osmand.views; +package net.osmand.views; import android.content.Context; import android.util.AttributeSet; diff --git a/OsmAnd/src/com/osmand/views/OsmandMapLayer.java b/OsmAnd/src/net/osmand/views/OsmandMapLayer.java similarity index 91% rename from OsmAnd/src/com/osmand/views/OsmandMapLayer.java rename to OsmAnd/src/net/osmand/views/OsmandMapLayer.java index e391e66c37..f6e09451b5 100644 --- a/OsmAnd/src/com/osmand/views/OsmandMapLayer.java +++ b/OsmAnd/src/net/osmand/views/OsmandMapLayer.java @@ -1,4 +1,4 @@ -package com.osmand.views; +package net.osmand.views; import android.graphics.Canvas; import android.graphics.PointF; diff --git a/OsmAnd/src/com/osmand/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/views/OsmandMapTileView.java similarity index 94% rename from OsmAnd/src/com/osmand/views/OsmandMapTileView.java rename to OsmAnd/src/net/osmand/views/OsmandMapTileView.java index 93a601dabf..251612e629 100644 --- a/OsmAnd/src/com/osmand/views/OsmandMapTileView.java +++ b/OsmAnd/src/net/osmand/views/OsmandMapTileView.java @@ -1,4 +1,4 @@ -package com.osmand.views; +package net.osmand.views; import java.util.ArrayList; @@ -6,6 +6,19 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import net.osmand.LogUtil; +import net.osmand.OsmandSettings; +import net.osmand.ResourceManager; +import net.osmand.data.preparation.MapTileDownloader; +import net.osmand.data.preparation.MapTileDownloader.DownloadRequest; +import net.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback; +import net.osmand.map.IMapLocationListener; +import net.osmand.map.ITileSource; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; +import net.osmand.views.AnimateDraggingMapThread.AnimateDraggingCallback; +import net.osmand.views.MultiTouchSupport.MultiTouchZoomListener; + import org.apache.commons.logging.Log; import android.content.Context; @@ -32,19 +45,6 @@ import android.view.GestureDetector.OnDoubleTapListener; import android.view.GestureDetector.OnGestureListener; import android.view.SurfaceHolder.Callback; -import com.osmand.LogUtil; -import com.osmand.OsmandSettings; -import com.osmand.ResourceManager; -import com.osmand.data.preparation.MapTileDownloader; -import com.osmand.data.preparation.MapTileDownloader.DownloadRequest; -import com.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback; -import com.osmand.map.IMapLocationListener; -import com.osmand.map.ITileSource; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; -import com.osmand.views.AnimateDraggingMapThread.AnimateDraggingCallback; -import com.osmand.views.MultiTouchSupport.MultiTouchZoomListener; - public class OsmandMapTileView extends SurfaceView implements IMapDownloaderCallback, Callback, AnimateDraggingCallback, OnGestureListener, OnDoubleTapListener, MultiTouchZoomListener { diff --git a/OsmAnd/src/com/osmand/views/POIMapLayer.java b/OsmAnd/src/net/osmand/views/POIMapLayer.java similarity index 91% rename from OsmAnd/src/com/osmand/views/POIMapLayer.java rename to OsmAnd/src/net/osmand/views/POIMapLayer.java index c8405b250c..b6ae35cb14 100644 --- a/OsmAnd/src/com/osmand/views/POIMapLayer.java +++ b/OsmAnd/src/net/osmand/views/POIMapLayer.java @@ -1,8 +1,16 @@ -package com.osmand.views; +package net.osmand.views; import java.util.ArrayList; import java.util.List; +import net.osmand.OsmandSettings; +import net.osmand.PoiFilter; +import net.osmand.R; +import net.osmand.ResourceManager; +import net.osmand.activities.EditingPOIActivity; +import net.osmand.data.Amenity; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; @@ -16,15 +24,6 @@ import android.util.DisplayMetrics; import android.view.WindowManager; import android.widget.Toast; -import com.osmand.OsmandSettings; -import com.osmand.PoiFilter; -import com.osmand.R; -import com.osmand.ResourceManager; -import com.osmand.activities.EditingPOIActivity; -import com.osmand.data.Amenity; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; - public class POIMapLayer implements OsmandMapLayer, ContextMenuLayer.IContextMenuProvider { // it is very slow to use with 15 level private static final int startZoom = 10; diff --git a/OsmAnd/src/com/osmand/views/PointLocationLayer.java b/OsmAnd/src/net/osmand/views/PointLocationLayer.java similarity index 94% rename from OsmAnd/src/com/osmand/views/PointLocationLayer.java rename to OsmAnd/src/net/osmand/views/PointLocationLayer.java index cc1ea250fe..b5eccc7025 100644 --- a/OsmAnd/src/com/osmand/views/PointLocationLayer.java +++ b/OsmAnd/src/net/osmand/views/PointLocationLayer.java @@ -1,5 +1,7 @@ -package com.osmand.views; +package net.osmand.views; +import net.osmand.OsmandSettings.ApplicationMode; +import net.osmand.osm.MapUtils; import android.content.Context; import android.graphics.Canvas; import android.graphics.Color; @@ -13,9 +15,6 @@ import android.location.Location; import android.util.DisplayMetrics; import android.view.WindowManager; -import com.osmand.OsmandSettings.ApplicationMode; -import com.osmand.osm.MapUtils; - public class PointLocationLayer implements OsmandMapLayer { protected final static int RADIUS = 7; protected final static int HEADING_RADIUS = 60; diff --git a/OsmAnd/src/com/osmand/views/PointNavigationLayer.java b/OsmAnd/src/net/osmand/views/PointNavigationLayer.java similarity index 94% rename from OsmAnd/src/com/osmand/views/PointNavigationLayer.java rename to OsmAnd/src/net/osmand/views/PointNavigationLayer.java index cf1a2fec59..5b68d798b5 100644 --- a/OsmAnd/src/com/osmand/views/PointNavigationLayer.java +++ b/OsmAnd/src/net/osmand/views/PointNavigationLayer.java @@ -1,5 +1,6 @@ -package com.osmand.views; +package net.osmand.views; +import net.osmand.osm.LatLon; import android.content.Context; import android.graphics.Canvas; import android.graphics.Color; @@ -12,8 +13,6 @@ import android.location.Location; import android.util.DisplayMetrics; import android.view.WindowManager; -import com.osmand.osm.LatLon; - public class PointNavigationLayer implements OsmandMapLayer { protected final static int RADIUS = 10; protected final static int DIST_TO_SHOW = 120; diff --git a/OsmAnd/src/com/osmand/views/RouteInfoLayer.java b/OsmAnd/src/net/osmand/views/RouteInfoLayer.java similarity index 91% rename from OsmAnd/src/com/osmand/views/RouteInfoLayer.java rename to OsmAnd/src/net/osmand/views/RouteInfoLayer.java index 5085b8d2a9..341d56979a 100644 --- a/OsmAnd/src/com/osmand/views/RouteInfoLayer.java +++ b/OsmAnd/src/net/osmand/views/RouteInfoLayer.java @@ -1,7 +1,12 @@ -package com.osmand.views; +package net.osmand.views; import java.util.List; +import net.osmand.R; +import net.osmand.activities.RoutingHelper; +import net.osmand.activities.ShowRouteInfoActivity; +import net.osmand.activities.RoutingHelper.IRouteInformationListener; +import net.osmand.activities.RoutingHelper.RouteDirectionInfo; import android.content.Context; import android.content.Intent; import android.graphics.Canvas; @@ -21,10 +26,6 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.FrameLayout.LayoutParams; -import com.osmand.activities.RoutingHelper; -import com.osmand.activities.ShowRouteInfoActivity; -import com.osmand.activities.RoutingHelper.IRouteInformationListener; -import com.osmand.activities.RoutingHelper.RouteDirectionInfo; public class RouteInfoLayer implements OsmandMapLayer, IRouteInformationListener { @@ -53,9 +54,9 @@ public class RouteInfoLayer implements OsmandMapLayer, IRouteInformationListener public RouteInfoLayer(RoutingHelper routingHelper, LinearLayout layout){ this.routingHelper = routingHelper; this.layout = layout; - prev = (Button) layout.findViewById(com.osmand.R.id.PreviousButton); - next = (Button) layout.findViewById(com.osmand.R.id.NextButton); - info = (Button) layout.findViewById(com.osmand.R.id.InfoButton); + prev = (Button) layout.findViewById(R.id.PreviousButton); + next = (Button) layout.findViewById(R.id.NextButton); + info = (Button) layout.findViewById(R.id.InfoButton); routingHelper.addListener(this); attachListeners(); updateVisibility(); diff --git a/OsmAnd/src/com/osmand/views/RouteLayer.java b/OsmAnd/src/net/osmand/views/RouteLayer.java similarity index 93% rename from OsmAnd/src/com/osmand/views/RouteLayer.java rename to OsmAnd/src/net/osmand/views/RouteLayer.java index 7bd58e25c4..65031b67a8 100644 --- a/OsmAnd/src/com/osmand/views/RouteLayer.java +++ b/OsmAnd/src/net/osmand/views/RouteLayer.java @@ -1,8 +1,11 @@ -package com.osmand.views; +package net.osmand.views; import java.util.ArrayList; import java.util.List; +import net.osmand.LogUtil; +import net.osmand.activities.RoutingHelper; +import net.osmand.osm.MapUtils; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; @@ -16,10 +19,6 @@ import android.graphics.Paint.Style; import android.location.Location; import android.util.Log; -import com.osmand.LogUtil; -import com.osmand.activities.RoutingHelper; -import com.osmand.osm.MapUtils; - public class RouteLayer implements OsmandMapLayer { private OsmandMapTileView view; diff --git a/OsmAnd/src/com/osmand/views/TransportInfoLayer.java b/OsmAnd/src/net/osmand/views/TransportInfoLayer.java similarity index 90% rename from OsmAnd/src/com/osmand/views/TransportInfoLayer.java rename to OsmAnd/src/net/osmand/views/TransportInfoLayer.java index da9f7b6c3e..c3984c320a 100644 --- a/OsmAnd/src/com/osmand/views/TransportInfoLayer.java +++ b/OsmAnd/src/net/osmand/views/TransportInfoLayer.java @@ -1,7 +1,14 @@ -package com.osmand.views; +package net.osmand.views; import java.util.List; +import net.osmand.OsmandSettings; +import net.osmand.TransportIndexRepository.RouteInfoLocation; +import net.osmand.activities.TransportRouteHelper; +import net.osmand.data.TransportRoute; +import net.osmand.data.TransportStop; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; import android.content.Context; import android.graphics.Canvas; import android.graphics.Color; @@ -13,14 +20,6 @@ import android.util.DisplayMetrics; import android.view.WindowManager; import android.widget.Toast; -import com.osmand.OsmandSettings; -import com.osmand.TransportIndexRepository.RouteInfoLocation; -import com.osmand.activities.TransportRouteHelper; -import com.osmand.data.TransportRoute; -import com.osmand.data.TransportStop; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; - public class TransportInfoLayer implements OsmandMapLayer { private final TransportRouteHelper routeHelper; diff --git a/OsmAnd/src/com/osmand/views/TransportStopsLayer.java b/OsmAnd/src/net/osmand/views/TransportStopsLayer.java similarity index 92% rename from OsmAnd/src/com/osmand/views/TransportStopsLayer.java rename to OsmAnd/src/net/osmand/views/TransportStopsLayer.java index 3aa1300272..bfad635640 100644 --- a/OsmAnd/src/com/osmand/views/TransportStopsLayer.java +++ b/OsmAnd/src/net/osmand/views/TransportStopsLayer.java @@ -1,8 +1,16 @@ -package com.osmand.views; +package net.osmand.views; import java.util.ArrayList; import java.util.List; +import net.osmand.OsmandSettings; +import net.osmand.R; +import net.osmand.ResourceManager; +import net.osmand.TransportIndexRepository; +import net.osmand.activities.search.SearchTransportActivity; +import net.osmand.data.TransportStop; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -17,15 +25,6 @@ import android.util.DisplayMetrics; import android.view.WindowManager; import android.widget.Toast; -import com.osmand.OsmandSettings; -import com.osmand.R; -import com.osmand.ResourceManager; -import com.osmand.TransportIndexRepository; -import com.osmand.activities.search.SearchTransportActivity; -import com.osmand.data.TransportStop; -import com.osmand.osm.LatLon; -import com.osmand.osm.MapUtils; - public class TransportStopsLayer implements OsmandMapLayer, ContextMenuLayer.IContextMenuProvider { private static final int startZoom = 12; diff --git a/OsmAnd/src/com/osmand/views/YandexTrafficLayer.java b/OsmAnd/src/net/osmand/views/YandexTrafficLayer.java similarity index 95% rename from OsmAnd/src/com/osmand/views/YandexTrafficLayer.java rename to OsmAnd/src/net/osmand/views/YandexTrafficLayer.java index 57a13c0278..b5c2f71d55 100644 --- a/OsmAnd/src/com/osmand/views/YandexTrafficLayer.java +++ b/OsmAnd/src/net/osmand/views/YandexTrafficLayer.java @@ -1,4 +1,4 @@ -package com.osmand.views; +package net.osmand.views; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -12,6 +12,11 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; +import net.osmand.Algoritms; +import net.osmand.LogUtil; +import net.osmand.R; +import net.osmand.osm.MapUtils; + import org.apache.commons.logging.Log; import android.graphics.Bitmap; @@ -28,11 +33,6 @@ import android.os.Message; import android.util.FloatMath; import android.widget.Toast; -import com.osmand.Algoritms; -import com.osmand.LogUtil; -import com.osmand.R; -import com.osmand.osm.MapUtils; - public class YandexTrafficLayer implements OsmandMapLayer { private static final long DELTA = 60000; diff --git a/OsmAnd/src/com/osmand/voice/CommandPlayer.java b/OsmAnd/src/net/osmand/voice/CommandPlayer.java similarity index 95% rename from OsmAnd/src/com/osmand/voice/CommandPlayer.java rename to OsmAnd/src/net/osmand/voice/CommandPlayer.java index f005d27ca6..fe4c4041d0 100644 --- a/OsmAnd/src/com/osmand/voice/CommandPlayer.java +++ b/OsmAnd/src/net/osmand/voice/CommandPlayer.java @@ -1,4 +1,4 @@ -package com.osmand.voice; +package net.osmand.voice; import java.io.File; @@ -11,6 +11,12 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; +import net.osmand.Algoritms; +import net.osmand.LogUtil; +import net.osmand.OsmandSettings; +import net.osmand.R; +import net.osmand.ResourceManager; + import org.apache.commons.logging.Log; import alice.tuprolog.InvalidLibraryException; @@ -27,12 +33,6 @@ import android.content.Context; import android.media.MediaPlayer; import android.os.Environment; -import com.osmand.Algoritms; -import com.osmand.LogUtil; -import com.osmand.OsmandSettings; -import com.osmand.R; -import com.osmand.ResourceManager; - public class CommandPlayer { public static final String VOICE_DIR = ResourceManager.APP_DIR + "/voice"; //$NON-NLS-1$