diff --git a/DataExtractionOSM/src/net/osmand/Algoritms.java b/DataExtractionOSM/src/net/osmand/Algoritms.java index 7067ed3c86..aea642ff95 100644 --- a/DataExtractionOSM/src/net/osmand/Algoritms.java +++ b/DataExtractionOSM/src/net/osmand/Algoritms.java @@ -6,7 +6,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import net.osmand.plus.LogUtil; +import net.osmand.LogUtil; import org.apache.commons.logging.Log; diff --git a/DataExtractionOSM/src/net/osmand/binary/BinaryMapIndexReader.java b/DataExtractionOSM/src/net/osmand/binary/BinaryMapIndexReader.java index 07d525064f..80043126e7 100644 --- a/DataExtractionOSM/src/net/osmand/binary/BinaryMapIndexReader.java +++ b/DataExtractionOSM/src/net/osmand/binary/BinaryMapIndexReader.java @@ -12,6 +12,7 @@ import java.util.List; import java.util.Map; import net.osmand.Algoritms; +import net.osmand.LogUtil; import net.osmand.StringMatcher; import net.osmand.binary.BinaryMapAddressReaderAdapter.AddressRegion; import net.osmand.binary.BinaryMapTransportReaderAdapter.TransportIndex; @@ -23,7 +24,6 @@ import net.osmand.osm.LatLon; import net.osmand.osm.MapRenderingTypes; import net.osmand.osm.MapUtils; import net.osmand.osm.MapRenderingTypes.MapRulType; -import net.osmand.plus.LogUtil; import net.sf.junidecode.Junidecode; import org.apache.commons.logging.Log; diff --git a/DataExtractionOSM/src/net/osmand/binary/BinaryRouteDataReader.java b/DataExtractionOSM/src/net/osmand/binary/BinaryRouteDataReader.java index deba1721ae..f85367423b 100644 --- a/DataExtractionOSM/src/net/osmand/binary/BinaryRouteDataReader.java +++ b/DataExtractionOSM/src/net/osmand/binary/BinaryRouteDataReader.java @@ -24,7 +24,7 @@ import net.osmand.binary.BinaryMapIndexReader.TagValuePair; import net.osmand.osm.LatLon; import net.osmand.osm.MapRenderingTypes; import net.osmand.osm.MapUtils; -import net.osmand.plus.LogUtil; +import net.osmand.LogUtil; import org.apache.commons.logging.Log; diff --git a/DataExtractionOSM/src/net/osmand/data/index/DataIndexReader.java b/DataExtractionOSM/src/net/osmand/data/index/DataIndexReader.java index 52c5e8d050..3fd0a343bc 100644 --- a/DataExtractionOSM/src/net/osmand/data/index/DataIndexReader.java +++ b/DataExtractionOSM/src/net/osmand/data/index/DataIndexReader.java @@ -17,7 +17,7 @@ import net.osmand.data.City; import net.osmand.data.Street; import net.osmand.data.City.CityType; import net.osmand.osm.Node; -import net.osmand.plus.LogUtil; +import net.osmand.LogUtil; import org.apache.commons.logging.Log; diff --git a/DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java b/DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java index cc0953920d..f197a34f18 100644 --- a/DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java +++ b/DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; -import net.osmand.plus.LogUtil; +import net.osmand.LogUtil; import org.apache.commons.logging.Log; diff --git a/DataExtractionOSM/src/net/osmand/data/index/GoogleCodeUploadIndex.java b/DataExtractionOSM/src/net/osmand/data/index/GoogleCodeUploadIndex.java index f08c1e904d..b276da1548 100644 --- a/DataExtractionOSM/src/net/osmand/data/index/GoogleCodeUploadIndex.java +++ b/DataExtractionOSM/src/net/osmand/data/index/GoogleCodeUploadIndex.java @@ -15,7 +15,7 @@ import java.net.MalformedURLException; import java.net.URL; import net.osmand.Base64; -import net.osmand.plus.LogUtil; +import net.osmand.LogUtil; import org.apache.commons.logging.Log; diff --git a/DataExtractionOSM/src/net/osmand/data/preparation/MapTileDownloader.java b/DataExtractionOSM/src/net/osmand/data/preparation/MapTileDownloader.java index f018b965cd..bb12955da6 100644 --- a/DataExtractionOSM/src/net/osmand/data/preparation/MapTileDownloader.java +++ b/DataExtractionOSM/src/net/osmand/data/preparation/MapTileDownloader.java @@ -18,7 +18,7 @@ import java.util.concurrent.TimeUnit; import net.osmand.Algoritms; import net.osmand.Version; -import net.osmand.plus.LogUtil; +import net.osmand.LogUtil; import org.apache.commons.logging.Log; diff --git a/DataExtractionOSM/src/net/osmand/impl/ConsoleProgressImplementation.java b/DataExtractionOSM/src/net/osmand/impl/ConsoleProgressImplementation.java index 8fc4f22c72..cfc1d8e1f8 100644 --- a/DataExtractionOSM/src/net/osmand/impl/ConsoleProgressImplementation.java +++ b/DataExtractionOSM/src/net/osmand/impl/ConsoleProgressImplementation.java @@ -4,7 +4,7 @@ import java.text.MessageFormat; import net.osmand.Algoritms; import net.osmand.IProgress; -import net.osmand.plus.LogUtil; +import net.osmand.LogUtil; import org.apache.commons.logging.Log; diff --git a/DataExtractionOSM/src/net/osmand/map/TileSourceManager.java b/DataExtractionOSM/src/net/osmand/map/TileSourceManager.java index 8763ddb268..d347e5bfcb 100644 --- a/DataExtractionOSM/src/net/osmand/map/TileSourceManager.java +++ b/DataExtractionOSM/src/net/osmand/map/TileSourceManager.java @@ -11,7 +11,7 @@ import java.util.regex.Pattern; import net.osmand.Algoritms; import net.osmand.osm.MapUtils; -import net.osmand.plus.LogUtil; +import net.osmand.LogUtil; import org.apache.commons.logging.Log; diff --git a/DataExtractionOSM/src/net/osmand/osm/MapRenderingTypes.java b/DataExtractionOSM/src/net/osmand/osm/MapRenderingTypes.java index e9098ed6e7..42f738f443 100644 --- a/DataExtractionOSM/src/net/osmand/osm/MapRenderingTypes.java +++ b/DataExtractionOSM/src/net/osmand/osm/MapRenderingTypes.java @@ -18,7 +18,7 @@ import javax.xml.parsers.SAXParserFactory; import net.osmand.data.AmenityType; import net.osmand.osm.OSMSettings.OSMTagKey; -import net.osmand.plus.LogUtil; +import net.osmand.LogUtil; import org.apache.commons.logging.Log; import org.xml.sax.Attributes; diff --git a/DataExtractionOSM/src/net/osmand/render/OsmandRenderingRulesParser.java b/DataExtractionOSM/src/net/osmand/render/OsmandRenderingRulesParser.java index 1708963cb5..34c76c7e12 100644 --- a/DataExtractionOSM/src/net/osmand/render/OsmandRenderingRulesParser.java +++ b/DataExtractionOSM/src/net/osmand/render/OsmandRenderingRulesParser.java @@ -12,7 +12,7 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import net.osmand.osm.MapRenderingTypes; -import net.osmand.plus.LogUtil; +import net.osmand.LogUtil; import org.apache.commons.logging.Log; import org.xml.sax.Attributes; diff --git a/OsmAnd/src/net/osmand/plus/FavouritePoint.java b/OsmAnd/src/net/osmand/FavouritePoint.java similarity index 92% rename from OsmAnd/src/net/osmand/plus/FavouritePoint.java rename to OsmAnd/src/net/osmand/FavouritePoint.java index 26c519422d..f4c5176663 100644 --- a/OsmAnd/src/net/osmand/plus/FavouritePoint.java +++ b/OsmAnd/src/net/osmand/FavouritePoint.java @@ -1,4 +1,5 @@ -package net.osmand.plus; +package net.osmand; + public class FavouritePoint { private String name; private double latitude; diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/GPXUtilities.java similarity index 97% rename from OsmAnd/src/net/osmand/plus/GPXUtilities.java rename to OsmAnd/src/net/osmand/GPXUtilities.java index f7fa4c5888..347c78b080 100644 --- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java +++ b/OsmAnd/src/net/osmand/GPXUtilities.java @@ -1,4 +1,4 @@ -package net.osmand.plus; +package net.osmand; import java.io.File; import java.io.FileInputStream; @@ -11,7 +11,6 @@ import java.util.List; import java.util.Map; import java.util.TimeZone; -import net.osmand.Version; import net.osmand.plus.R; import org.apache.commons.logging.Log; diff --git a/OsmAnd/src/net/osmand/plus/LogUtil.java b/OsmAnd/src/net/osmand/LogUtil.java similarity index 95% rename from OsmAnd/src/net/osmand/plus/LogUtil.java rename to OsmAnd/src/net/osmand/LogUtil.java index b5acdee174..0aef04c813 100644 --- a/OsmAnd/src/net/osmand/plus/LogUtil.java +++ b/OsmAnd/src/net/osmand/LogUtil.java @@ -1,4 +1,4 @@ -package net.osmand.plus; +package net.osmand; import org.apache.commons.logging.Log; diff --git a/OsmAnd/src/net/osmand/plus/AmenityIndexRepositoryBinary.java b/OsmAnd/src/net/osmand/plus/AmenityIndexRepositoryBinary.java index aba6b5ead3..814f87a4d5 100644 --- a/OsmAnd/src/net/osmand/plus/AmenityIndexRepositoryBinary.java +++ b/OsmAnd/src/net/osmand/plus/AmenityIndexRepositoryBinary.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import java.util.List; import net.osmand.Algoritms; +import net.osmand.LogUtil; import net.osmand.binary.BinaryIndexPart; import net.osmand.binary.BinaryMapDataObject; import net.osmand.binary.BinaryMapIndexReader; diff --git a/OsmAnd/src/net/osmand/plus/AmenityIndexRepositoryOdb.java b/OsmAnd/src/net/osmand/plus/AmenityIndexRepositoryOdb.java index c9b2f8db17..c908205673 100644 --- a/OsmAnd/src/net/osmand/plus/AmenityIndexRepositoryOdb.java +++ b/OsmAnd/src/net/osmand/plus/AmenityIndexRepositoryOdb.java @@ -13,6 +13,7 @@ import java.util.Map; import net.osmand.Algoritms; import net.osmand.IProgress; +import net.osmand.LogUtil; import net.osmand.data.Amenity; import net.osmand.data.AmenityType; import net.osmand.data.index.IndexConstants; diff --git a/OsmAnd/src/net/osmand/plus/BaseLocationIndexRepository.java b/OsmAnd/src/net/osmand/plus/BaseLocationIndexRepository.java index 0d14e9189e..09a420a887 100644 --- a/OsmAnd/src/net/osmand/plus/BaseLocationIndexRepository.java +++ b/OsmAnd/src/net/osmand/plus/BaseLocationIndexRepository.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.List; import net.osmand.IProgress; +import net.osmand.LogUtil; import net.osmand.data.MapObject; import net.osmand.osm.LatLon; import net.osmand.osm.MapUtils; diff --git a/OsmAnd/src/net/osmand/plus/BusyIndicator.java b/OsmAnd/src/net/osmand/plus/BusyIndicator.java index fe19e212db..77d76107d0 100644 --- a/OsmAnd/src/net/osmand/plus/BusyIndicator.java +++ b/OsmAnd/src/net/osmand/plus/BusyIndicator.java @@ -1,6 +1,5 @@ package net.osmand.plus; -import net.osmand.plus.R; import android.content.Context; import android.graphics.drawable.Drawable; import android.os.Handler; diff --git a/OsmAnd/src/net/osmand/plus/DownloadOsmandIndexesHelper.java b/OsmAnd/src/net/osmand/plus/DownloadOsmandIndexesHelper.java index dc0b3c6597..c118922e42 100644 --- a/OsmAnd/src/net/osmand/plus/DownloadOsmandIndexesHelper.java +++ b/OsmAnd/src/net/osmand/plus/DownloadOsmandIndexesHelper.java @@ -6,8 +6,8 @@ import java.util.Comparator; import java.util.Map; import java.util.TreeMap; +import net.osmand.LogUtil; import net.osmand.data.index.IndexConstants; -import net.osmand.plus.R; import org.apache.commons.logging.Log; import org.xmlpull.v1.XmlPullParser; diff --git a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java index 6b4c37f135..788dc205a5 100644 --- a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java +++ b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java @@ -5,6 +5,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import net.osmand.FavouritePoint; import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; diff --git a/OsmAnd/src/net/osmand/plus/NameFinderPoiFilter.java b/OsmAnd/src/net/osmand/plus/NameFinderPoiFilter.java index 1dcbfdc087..3e39acde6f 100644 --- a/OsmAnd/src/net/osmand/plus/NameFinderPoiFilter.java +++ b/OsmAnd/src/net/osmand/plus/NameFinderPoiFilter.java @@ -7,6 +7,7 @@ import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; +import net.osmand.LogUtil; import net.osmand.Messages; import net.osmand.data.Amenity; import net.osmand.data.AmenityType; diff --git a/OsmAnd/src/net/osmand/plus/NavigationService.java b/OsmAnd/src/net/osmand/plus/NavigationService.java index 9d4759ada2..55ffc3bfe5 100644 --- a/OsmAnd/src/net/osmand/plus/NavigationService.java +++ b/OsmAnd/src/net/osmand/plus/NavigationService.java @@ -2,7 +2,6 @@ package net.osmand.plus; import net.osmand.Version; -import net.osmand.plus.R; import net.osmand.plus.activities.OsmandApplication; import net.osmand.plus.activities.RoutingHelper; import net.osmand.plus.activities.SavingTrackHelper; diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index c9805ed564..2e98d377b6 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -8,11 +8,11 @@ import java.io.InputStreamReader; import java.util.List; import java.util.regex.Pattern; +import net.osmand.LogUtil; import net.osmand.map.ITileSource; import net.osmand.map.TileSourceManager; import net.osmand.map.TileSourceManager.TileSourceTemplate; import net.osmand.osm.LatLon; -import net.osmand.plus.R; import net.osmand.plus.activities.OsmandApplication; import net.osmand.plus.activities.RouteProvider.RouteService; import net.osmand.plus.activities.search.SearchHistoryHelper; diff --git a/OsmAnd/src/net/osmand/plus/ProgressDialogImplementation.java b/OsmAnd/src/net/osmand/plus/ProgressDialogImplementation.java index 9e55ecda16..5278023362 100644 --- a/OsmAnd/src/net/osmand/plus/ProgressDialogImplementation.java +++ b/OsmAnd/src/net/osmand/plus/ProgressDialogImplementation.java @@ -1,7 +1,6 @@ package net.osmand.plus; import net.osmand.IProgress; -import net.osmand.plus.R; import android.app.ProgressDialog; import android.content.Context; import android.content.DialogInterface; diff --git a/OsmAnd/src/net/osmand/plus/RegionAddressRepositoryBinary.java b/OsmAnd/src/net/osmand/plus/RegionAddressRepositoryBinary.java index 11311e476a..c4a17a252f 100644 --- a/OsmAnd/src/net/osmand/plus/RegionAddressRepositoryBinary.java +++ b/OsmAnd/src/net/osmand/plus/RegionAddressRepositoryBinary.java @@ -11,6 +11,7 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; +import net.osmand.LogUtil; import net.osmand.binary.BinaryMapIndexReader; import net.osmand.data.Building; import net.osmand.data.City; diff --git a/OsmAnd/src/net/osmand/plus/RegionAddressRepositoryOdb.java b/OsmAnd/src/net/osmand/plus/RegionAddressRepositoryOdb.java index 6667e7689b..e214319f97 100644 --- a/OsmAnd/src/net/osmand/plus/RegionAddressRepositoryOdb.java +++ b/OsmAnd/src/net/osmand/plus/RegionAddressRepositoryOdb.java @@ -16,6 +16,7 @@ import java.util.TreeSet; import net.osmand.Algoritms; import net.osmand.IProgress; +import net.osmand.LogUtil; import net.osmand.data.Building; import net.osmand.data.City; import net.osmand.data.MapObject; diff --git a/OsmAnd/src/net/osmand/plus/ResourceManager.java b/OsmAnd/src/net/osmand/plus/ResourceManager.java index 99414aa65a..d14117e55e 100644 --- a/OsmAnd/src/net/osmand/plus/ResourceManager.java +++ b/OsmAnd/src/net/osmand/plus/ResourceManager.java @@ -15,6 +15,7 @@ import java.util.Stack; import java.util.TreeMap; import net.osmand.IProgress; +import net.osmand.LogUtil; import net.osmand.Messages; import net.osmand.binary.BinaryMapIndexReader; import net.osmand.data.Amenity; diff --git a/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java b/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java index 6c82a9d2af..f3b89274a9 100644 --- a/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java +++ b/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java @@ -7,6 +7,7 @@ import java.nio.ByteBuffer; import java.text.MessageFormat; import net.osmand.Algoritms; +import net.osmand.LogUtil; import net.osmand.map.ITileSource; import net.osmand.map.TileSourceManager; import net.osmand.map.TileSourceManager.TileSourceTemplate; diff --git a/OsmAnd/src/net/osmand/plus/TransportIndexRepositoryBinary.java b/OsmAnd/src/net/osmand/plus/TransportIndexRepositoryBinary.java index 9959a443a8..411f6960db 100644 --- a/OsmAnd/src/net/osmand/plus/TransportIndexRepositoryBinary.java +++ b/OsmAnd/src/net/osmand/plus/TransportIndexRepositoryBinary.java @@ -9,6 +9,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import net.osmand.LogUtil; import net.osmand.binary.BinaryMapIndexReader; import net.osmand.binary.BinaryMapIndexReader.SearchRequest; import net.osmand.data.TransportRoute; diff --git a/OsmAnd/src/net/osmand/plus/TransportIndexRepositoryOdb.java b/OsmAnd/src/net/osmand/plus/TransportIndexRepositoryOdb.java index 79660a66cd..779aa0cc46 100644 --- a/OsmAnd/src/net/osmand/plus/TransportIndexRepositoryOdb.java +++ b/OsmAnd/src/net/osmand/plus/TransportIndexRepositoryOdb.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Map; import net.osmand.IProgress; +import net.osmand.LogUtil; import net.osmand.data.TransportRoute; import net.osmand.data.TransportStop; import net.osmand.data.index.IndexConstants; diff --git a/OsmAnd/src/net/osmand/plus/activities/DayNightHelper.java b/OsmAnd/src/net/osmand/plus/activities/DayNightHelper.java index b14d8d05ae..eee3e9d896 100644 --- a/OsmAnd/src/net/osmand/plus/activities/DayNightHelper.java +++ b/OsmAnd/src/net/osmand/plus/activities/DayNightHelper.java @@ -5,10 +5,10 @@ import java.util.Date; import java.util.List; import java.util.TimeZone; -import net.osmand.plus.LogUtil; +import net.osmand.LogUtil; +import net.osmand.SunriseSunset; import net.osmand.plus.OsmandSettings; import net.osmand.plus.OsmandSettings.DayNightMode; -import net.osmand.SunriseSunset; import org.apache.commons.logging.Log; diff --git a/OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java b/OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java index fd393a661f..d6f9820c5b 100644 --- a/OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java @@ -14,7 +14,6 @@ import static net.osmand.data.index.IndexConstants.TRANSPORT_INDEX_EXT_ZIP; import static net.osmand.data.index.IndexConstants.TRANSPORT_TABLE_VERSION; import static net.osmand.data.index.IndexConstants.VOICE_INDEX_EXT_ZIP; import static net.osmand.data.index.IndexConstants.VOICE_VERSION; -import static net.osmand.plus.DownloadOsmandIndexesHelper.IndexItem; import java.io.File; import java.io.FileInputStream; @@ -29,30 +28,25 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collection; -import java.util.Comparator; import java.util.Date; import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.TreeMap; import java.util.Map.Entry; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import net.osmand.IProgress; +import net.osmand.LogUtil; +import net.osmand.data.index.IndexConstants; import net.osmand.plus.DownloadOsmandIndexesHelper; -import net.osmand.plus.LogUtil; import net.osmand.plus.ProgressDialogImplementation; import net.osmand.plus.R; import net.osmand.plus.ResourceManager; -import net.osmand.data.index.DownloaderIndexFromGoogleCode; -import net.osmand.data.index.IndexConstants; +import net.osmand.plus.DownloadOsmandIndexesHelper.IndexItem; import org.apache.commons.logging.Log; -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; -import org.xmlpull.v1.XmlPullParserFactory; import android.app.AlertDialog; import android.app.ListActivity; diff --git a/OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java b/OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java index 5d45de4aa9..d949f52eb5 100644 --- a/OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java +++ b/OsmAnd/src/net/osmand/plus/activities/DownloadTilesDialog.java @@ -3,15 +3,15 @@ package net.osmand.plus.activities; import java.text.MessageFormat; import java.util.ArrayList; -import net.osmand.plus.LogUtil; -import net.osmand.plus.R; -import net.osmand.plus.ResourceManager; -import net.osmand.plus.views.OsmandMapTileView; +import net.osmand.LogUtil; 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.MapUtils; +import net.osmand.plus.R; +import net.osmand.plus.ResourceManager; +import net.osmand.plus.views.OsmandMapTileView; import org.apache.commons.logging.Log; diff --git a/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java b/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java index 6678de961a..dac39c29ca 100644 --- a/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java @@ -7,14 +7,14 @@ import java.text.MessageFormat; import java.util.LinkedHashSet; import java.util.Set; +import net.osmand.data.AmenityType; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapRenderingTypes; import net.osmand.plus.OsmandSettings; import net.osmand.plus.PoiFilter; import net.osmand.plus.PoiFiltersHelper; import net.osmand.plus.R; import net.osmand.plus.activities.search.SearchPOIActivity; -import net.osmand.data.AmenityType; -import net.osmand.osm.LatLon; -import net.osmand.osm.MapRenderingTypes; import android.app.AlertDialog; import android.app.ListActivity; import android.app.AlertDialog.Builder; diff --git a/OsmAnd/src/net/osmand/plus/activities/EditingPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/EditingPOIActivity.java index c31b6ade1b..53ba850049 100644 --- a/OsmAnd/src/net/osmand/plus/activities/EditingPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/EditingPOIActivity.java @@ -20,12 +20,7 @@ import java.util.Map; import java.util.Set; import net.osmand.Base64; -import net.osmand.plus.AmenityIndexRepository; -import net.osmand.plus.AmenityIndexRepositoryOdb; -import net.osmand.plus.LogUtil; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.R; -import net.osmand.plus.views.OsmandMapTileView; +import net.osmand.LogUtil; import net.osmand.Version; import net.osmand.data.Amenity; import net.osmand.data.AmenityType; @@ -41,6 +36,11 @@ 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.plus.AmenityIndexRepository; +import net.osmand.plus.AmenityIndexRepositoryOdb; +import net.osmand.plus.OsmandSettings; +import net.osmand.plus.R; +import net.osmand.plus.views.OsmandMapTileView; import org.apache.commons.logging.Log; import org.apache.http.HttpResponse; diff --git a/OsmAnd/src/net/osmand/plus/activities/FavouritesActivity.java b/OsmAnd/src/net/osmand/plus/activities/FavouritesActivity.java index 9afb7b4091..e7322f42a5 100644 --- a/OsmAnd/src/net/osmand/plus/activities/FavouritesActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/FavouritesActivity.java @@ -11,16 +11,16 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import net.osmand.plus.FavouritePoint; +import net.osmand.FavouritePoint; +import net.osmand.GPXUtilities; +import net.osmand.GPXUtilities.GPXFileResult; +import net.osmand.GPXUtilities.WptPt; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; import net.osmand.plus.FavouritesDbHelper; -import net.osmand.plus.GPXUtilities; import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.ResourceManager; -import net.osmand.plus.GPXUtilities.GPXFileResult; -import net.osmand.plus.GPXUtilities.WptPt; -import net.osmand.osm.LatLon; -import net.osmand.osm.MapUtils; import android.app.AlertDialog; import android.app.ListActivity; import android.app.AlertDialog.Builder; diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java index 13d1ea66e7..4311f87499 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java @@ -3,10 +3,10 @@ package net.osmand.plus.activities; import java.io.File; import java.text.MessageFormat; +import net.osmand.Version; import net.osmand.plus.R; import net.osmand.plus.ResourceManager; import net.osmand.plus.activities.search.SearchActivity; -import net.osmand.Version; import android.app.Activity; import android.app.AlertDialog; import android.app.AlertDialog.Builder; diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java index 98c4199944..7fa4574cc4 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java @@ -12,21 +12,31 @@ import java.util.List; import java.util.Map; import net.osmand.Algoritms; +import net.osmand.FavouritePoint; +import net.osmand.GPXUtilities; +import net.osmand.LogUtil; +import net.osmand.Version; +import net.osmand.GPXUtilities.GPXFileResult; +import net.osmand.GPXUtilities.WptPt; +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.plus.AmenityIndexRepository; import net.osmand.plus.AmenityIndexRepositoryOdb; import net.osmand.plus.BusyIndicator; -import net.osmand.plus.FavouritePoint; import net.osmand.plus.FavouritesDbHelper; -import net.osmand.plus.GPXUtilities; -import net.osmand.plus.LogUtil; import net.osmand.plus.OsmandSettings; import net.osmand.plus.PoiFilter; import net.osmand.plus.PoiFiltersHelper; import net.osmand.plus.R; import net.osmand.plus.ResourceManager; import net.osmand.plus.SQLiteTileSource; -import net.osmand.plus.GPXUtilities.GPXFileResult; -import net.osmand.plus.GPXUtilities.WptPt; import net.osmand.plus.OsmandSettings.ApplicationMode; import net.osmand.plus.activities.search.SearchActivity; import net.osmand.plus.activities.search.SearchPoiFilterActivity; @@ -48,24 +58,14 @@ import net.osmand.plus.views.RouteLayer; import net.osmand.plus.views.TransportInfoLayer; import net.osmand.plus.views.TransportStopsLayer; import net.osmand.plus.views.YandexTrafficLayer; -import net.osmand.Version; -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 android.app.Activity; import android.app.AlertDialog; -import android.app.AlertDialog.Builder; import android.app.Dialog; import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; import android.app.ProgressDialog; +import android.app.AlertDialog.Builder; import android.content.ActivityNotFoundException; import android.content.ComponentName; import android.content.DialogInterface; @@ -103,8 +103,8 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; -import android.view.View.OnClickListener; import android.view.Window; +import android.view.View.OnClickListener; import android.widget.CompoundButton; import android.widget.EditText; import android.widget.ImageButton; @@ -1430,7 +1430,7 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso }); } else { OsmandSettings.setShowingFavorites(MapActivity.this, true); - List pts = new ArrayList(); + List pts = new ArrayList(); for(WptPt p : res.wayPoints){ FavouritePoint pt = new FavouritePoint(); pt.setLatitude(p.lat); diff --git a/OsmAnd/src/net/osmand/plus/activities/NavigatePointActivity.java b/OsmAnd/src/net/osmand/plus/activities/NavigatePointActivity.java index a14e1fcd95..3787d35ea9 100644 --- a/OsmAnd/src/net/osmand/plus/activities/NavigatePointActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/NavigatePointActivity.java @@ -5,12 +5,12 @@ import java.text.DecimalFormatSymbols; import java.text.MessageFormat; import java.util.Locale; -import net.osmand.plus.LogUtil; +import net.osmand.LogUtil; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.views.OsmandMapTileView; -import net.osmand.osm.LatLon; -import net.osmand.osm.MapUtils; import android.app.Activity; import android.app.Dialog; import android.content.Intent; diff --git a/OsmAnd/src/net/osmand/plus/activities/OpeningHoursView.java b/OsmAnd/src/net/osmand/plus/activities/OpeningHoursView.java index f8545424ee..57b79542fc 100644 --- a/OsmAnd/src/net/osmand/plus/activities/OpeningHoursView.java +++ b/OsmAnd/src/net/osmand/plus/activities/OpeningHoursView.java @@ -5,9 +5,9 @@ import java.util.Arrays; import java.util.Calendar; import java.util.List; -import net.osmand.plus.R; import net.osmand.osm.OpeningHoursParser.BasicDayOpeningHourRule; import net.osmand.osm.OpeningHoursParser.OpeningHoursRule; +import net.osmand.plus.R; import android.app.AlertDialog; import android.app.AlertDialog.Builder; import android.content.Context; diff --git a/OsmAnd/src/net/osmand/plus/activities/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/activities/OsmandApplication.java index 850fec5f68..fba42768ac 100644 --- a/OsmAnd/src/net/osmand/plus/activities/OsmandApplication.java +++ b/OsmAnd/src/net/osmand/plus/activities/OsmandApplication.java @@ -8,22 +8,22 @@ import java.io.PrintStream; import java.lang.Thread.UncaughtExceptionHandler; import java.util.List; -import net.osmand.Algoritms; +import net.osmand.Algoritms; +import net.osmand.LogUtil; import net.osmand.plus.FavouritesDbHelper; -import net.osmand.plus.LogUtil; import net.osmand.plus.OsmandSettings; import net.osmand.plus.PoiFiltersHelper; import net.osmand.plus.ProgressDialogImplementation; import net.osmand.plus.R; import net.osmand.plus.ResourceManager; import net.osmand.plus.voice.CommandPlayer; -import android.app.AlertDialog; +import android.app.AlertDialog; import android.app.Application; import android.app.ProgressDialog; -import android.app.AlertDialog.Builder; +import android.app.AlertDialog.Builder; import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; +import android.content.DialogInterface; +import android.content.Intent; import android.os.Environment; import android.os.Handler; import android.text.format.DateFormat; diff --git a/OsmAnd/src/net/osmand/plus/activities/RouteProvider.java b/OsmAnd/src/net/osmand/plus/activities/RouteProvider.java index a5377c1ebb..ec32d28c17 100644 --- a/OsmAnd/src/net/osmand/plus/activities/RouteProvider.java +++ b/OsmAnd/src/net/osmand/plus/activities/RouteProvider.java @@ -15,12 +15,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.FactoryConfigurationError; import javax.xml.parsers.ParserConfigurationException; -import net.osmand.plus.LogUtil; -import net.osmand.plus.R; -import net.osmand.plus.OsmandSettings.ApplicationMode; -import net.osmand.plus.activities.RoutingHelper.RouteDirectionInfo; -import net.osmand.plus.activities.RoutingHelper.TurnType; -import net.osmand.plus.render.MapRenderRepositories; +import net.osmand.LogUtil; import net.osmand.binary.BinaryMapIndexReader; import net.osmand.binary.BinaryRouteDataReader; import net.osmand.binary.BinaryRouteDataReader.RouteSegment; @@ -28,6 +23,11 @@ import net.osmand.binary.BinaryRouteDataReader.RouteSegmentResult; import net.osmand.binary.BinaryRouteDataReader.RoutingContext; import net.osmand.osm.LatLon; import net.osmand.osm.MapUtils; +import net.osmand.plus.R; +import net.osmand.plus.OsmandSettings.ApplicationMode; +import net.osmand.plus.activities.RoutingHelper.RouteDirectionInfo; +import net.osmand.plus.activities.RoutingHelper.TurnType; +import net.osmand.plus.render.MapRenderRepositories; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/OsmAnd/src/net/osmand/plus/activities/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/activities/RoutingHelper.java index 1efd2fc2e5..1fd5b62c93 100644 --- a/OsmAnd/src/net/osmand/plus/activities/RoutingHelper.java +++ b/OsmAnd/src/net/osmand/plus/activities/RoutingHelper.java @@ -4,15 +4,15 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import net.osmand.plus.LogUtil; +import net.osmand.LogUtil; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.OsmandSettings.ApplicationMode; import net.osmand.plus.activities.RouteProvider.RouteCalculationResult; import net.osmand.plus.activities.RouteProvider.RouteService; import net.osmand.plus.voice.CommandPlayer; -import net.osmand.osm.LatLon; -import net.osmand.osm.MapUtils; import android.app.Activity; import android.content.Context; import android.location.Location; diff --git a/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java b/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java index 6cd00db5a8..59257cb137 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java +++ b/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java @@ -6,11 +6,11 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import net.osmand.plus.GPXUtilities; -import net.osmand.plus.LogUtil; +import net.osmand.GPXUtilities; +import net.osmand.LogUtil; +import net.osmand.GPXUtilities.TrkPt; import net.osmand.plus.OsmandSettings; import net.osmand.plus.ResourceManager; -import net.osmand.plus.GPXUtilities.TrkPt; import org.apache.commons.logging.Log; diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java index 93bdf5bcb6..235069227f 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java @@ -10,6 +10,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.osmand.map.TileSourceManager; +import net.osmand.map.TileSourceManager.TileSourceTemplate; import net.osmand.plus.NavigationService; import net.osmand.plus.OsmandSettings; import net.osmand.plus.PoiFiltersHelper; @@ -22,8 +24,6 @@ import net.osmand.plus.OsmandSettings.DayNightMode; import net.osmand.plus.activities.RouteProvider.RouteService; import net.osmand.plus.render.BaseOsmandRender; import net.osmand.plus.render.RendererRegistry; -import net.osmand.map.TileSourceManager; -import net.osmand.map.TileSourceManager.TileSourceTemplate; import android.app.ProgressDialog; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -41,10 +41,10 @@ import android.preference.CheckBoxPreference; import android.preference.EditTextPreference; import android.preference.ListPreference; import android.preference.Preference; -import android.preference.Preference.OnPreferenceChangeListener; -import android.preference.Preference.OnPreferenceClickListener; import android.preference.PreferenceActivity; import android.preference.PreferenceScreen; +import android.preference.Preference.OnPreferenceChangeListener; +import android.preference.Preference.OnPreferenceClickListener; import android.widget.Toast; public class SettingsActivity extends PreferenceActivity implements OnPreferenceChangeListener, OnPreferenceClickListener { diff --git a/OsmAnd/src/net/osmand/plus/activities/ShowRouteInfoActivity.java b/OsmAnd/src/net/osmand/plus/activities/ShowRouteInfoActivity.java index dba30769cf..42d9dd5497 100644 --- a/OsmAnd/src/net/osmand/plus/activities/ShowRouteInfoActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/ShowRouteInfoActivity.java @@ -6,12 +6,12 @@ package net.osmand.plus.activities; import java.text.MessageFormat; import java.util.List; +import net.osmand.osm.MapUtils; import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.RoutingHelper.RouteDirectionInfo; import net.osmand.plus.activities.RoutingHelper.TurnType; import net.osmand.plus.views.MapInfoLayer; -import net.osmand.osm.MapUtils; import android.app.ListActivity; import android.content.Intent; import android.graphics.Canvas; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressActivity.java index a2c9cd2463..6be12ef2eb 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressActivity.java @@ -3,17 +3,17 @@ package net.osmand.plus.activities.search; import java.text.MessageFormat; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.R; -import net.osmand.plus.RegionAddressRepository; -import net.osmand.plus.activities.MapActivity; -import net.osmand.plus.activities.OsmandApplication; 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.plus.OsmandSettings; +import net.osmand.plus.R; +import net.osmand.plus.RegionAddressRepository; +import net.osmand.plus.activities.MapActivity; +import net.osmand.plus.activities.OsmandApplication; import android.app.Activity; import android.app.ProgressDialog; import android.content.Intent; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineActivity.java index cd81e20929..b2b0c72eaf 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineActivity.java @@ -9,13 +9,13 @@ import java.util.List; import java.util.Locale; import net.osmand.Algoritms; -import net.osmand.plus.LogUtil; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.R; -import net.osmand.plus.activities.MapActivity; +import net.osmand.LogUtil; import net.osmand.Version; import net.osmand.osm.LatLon; import net.osmand.osm.MapUtils; +import net.osmand.plus.OsmandSettings; +import net.osmand.plus.R; +import net.osmand.plus.activities.MapActivity; import org.apache.commons.logging.Log; import org.xmlpull.v1.XmlPullParser; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchBuildingByNameActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchBuildingByNameActivity.java index bee03d630a..406b463d28 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchBuildingByNameActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchBuildingByNameActivity.java @@ -3,14 +3,14 @@ package net.osmand.plus.activities.search; import java.util.ArrayList; import java.util.List; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.R; -import net.osmand.plus.RegionAddressRepository; -import net.osmand.plus.activities.OsmandApplication; import net.osmand.data.Building; import net.osmand.data.City; import net.osmand.data.PostCode; import net.osmand.data.Street; +import net.osmand.plus.OsmandSettings; +import net.osmand.plus.R; +import net.osmand.plus.RegionAddressRepository; +import net.osmand.plus.activities.OsmandApplication; import android.content.SharedPreferences; import android.os.Bundle; import android.widget.TextView; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchCityByNameActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchCityByNameActivity.java index 5bd0c475e1..a5d0805b5c 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchCityByNameActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchCityByNameActivity.java @@ -3,15 +3,15 @@ package net.osmand.plus.activities.search; import java.util.ArrayList; import java.util.List; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.R; -import net.osmand.plus.RegionAddressRepository; -import net.osmand.plus.activities.OsmandApplication; 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 net.osmand.plus.OsmandSettings; +import net.osmand.plus.R; +import net.osmand.plus.RegionAddressRepository; +import net.osmand.plus.activities.OsmandApplication; import android.os.Bundle; import android.widget.TextView; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryActivity.java index b6acc074f0..f9e7ffe959 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryActivity.java @@ -2,12 +2,12 @@ package net.osmand.plus.activities.search; import java.util.List; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.search.SearchHistoryHelper.HistoryEntry; -import net.osmand.osm.LatLon; -import net.osmand.osm.MapUtils; import android.app.AlertDialog; import android.app.ListActivity; import android.content.DialogInterface; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index 718f7ba106..7da1096870 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -5,22 +5,22 @@ package net.osmand.plus.activities.search; import java.util.ArrayList; import java.util.Calendar; -import java.util.Collection; +import java.util.Collection; import java.util.List; import net.osmand.Algoritms; -import net.osmand.plus.LogUtil; +import net.osmand.LogUtil; +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 net.osmand.plus.NameFinderPoiFilter; import net.osmand.plus.OsmandSettings; import net.osmand.plus.PoiFilter; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.OsmandApplication; -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.AlertDialog; import android.app.ListActivity; import android.content.DialogInterface; @@ -59,7 +59,7 @@ import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.EditText; -import android.widget.Filter; +import android.widget.Filter; import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterActivity.java index 6839dab9e8..79bf8b8493 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterActivity.java @@ -6,13 +6,13 @@ package net.osmand.plus.activities.search; import java.util.ArrayList; import java.util.List; +import net.osmand.osm.LatLon; import net.osmand.plus.OsmandSettings; import net.osmand.plus.PoiFilter; import net.osmand.plus.PoiFiltersHelper; import net.osmand.plus.R; import net.osmand.plus.activities.EditPOIFilterActivity; import net.osmand.plus.activities.OsmandApplication; -import net.osmand.osm.LatLon; import android.app.AlertDialog; import android.app.ListActivity; import android.content.DialogInterface; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchStreet2ByNameActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchStreet2ByNameActivity.java index 46cd65c26d..f9907e72b5 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchStreet2ByNameActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchStreet2ByNameActivity.java @@ -3,13 +3,13 @@ package net.osmand.plus.activities.search; import java.util.ArrayList; import java.util.List; +import net.osmand.data.City; +import net.osmand.data.PostCode; +import net.osmand.data.Street; import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.RegionAddressRepository; import net.osmand.plus.activities.OsmandApplication; -import net.osmand.data.City; -import net.osmand.data.PostCode; -import net.osmand.data.Street; import android.app.ProgressDialog; import android.content.SharedPreferences; import android.os.Bundle; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchStreetByNameActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchStreetByNameActivity.java index 05e3e1ab4e..a5c724393e 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchStreetByNameActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchStreetByNameActivity.java @@ -3,13 +3,13 @@ package net.osmand.plus.activities.search; import java.util.ArrayList; import java.util.List; +import net.osmand.data.City; +import net.osmand.data.PostCode; +import net.osmand.data.Street; import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.RegionAddressRepository; import net.osmand.plus.activities.OsmandApplication; -import net.osmand.data.City; -import net.osmand.data.PostCode; -import net.osmand.data.Street; import android.content.SharedPreferences; import android.os.Bundle; import android.widget.TextView; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportActivity.java index d03ee16fca..172a578cef 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportActivity.java @@ -9,16 +9,16 @@ import java.util.List; import net.osmand.Algoritms; import net.osmand.Messages; +import net.osmand.data.TransportRoute; +import net.osmand.data.TransportStop; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.TransportIndexRepository; import net.osmand.plus.TransportIndexRepository.RouteInfoLocation; import net.osmand.plus.activities.OsmandApplication; import net.osmand.plus.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; diff --git a/OsmAnd/src/net/osmand/plus/render/BaseOsmandRender.java b/OsmAnd/src/net/osmand/plus/render/BaseOsmandRender.java index 2948c529fe..4792b25ac1 100644 --- a/OsmAnd/src/net/osmand/plus/render/BaseOsmandRender.java +++ b/OsmAnd/src/net/osmand/plus/render/BaseOsmandRender.java @@ -7,7 +7,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import net.osmand.plus.LogUtil; +import net.osmand.LogUtil; import net.osmand.plus.render.OsmandRenderer.RenderingContext; import net.osmand.plus.render.OsmandRenderer.RenderingPaintProperties; import net.osmand.render.OsmandRenderingRulesParser; diff --git a/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java b/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java index d0d4eb11b6..ec6a7c627e 100644 --- a/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java +++ b/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java @@ -1,7 +1,6 @@ package net.osmand.plus.render; import gnu.trove.list.array.TIntArrayList; -import gnu.trove.map.TIntByteMap; import gnu.trove.set.TLongSet; import gnu.trove.set.hash.TLongHashSet; @@ -20,12 +19,7 @@ import java.util.Map; import java.util.Set; import net.osmand.IProgress; -import net.osmand.plus.LogUtil; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.R; -import net.osmand.plus.RotatedTileBox; -import net.osmand.plus.activities.OsmandApplication; -import net.osmand.plus.render.OsmandRenderer.RenderingContext; +import net.osmand.LogUtil; import net.osmand.binary.BinaryMapDataObject; import net.osmand.binary.BinaryMapIndexReader; import net.osmand.binary.BinaryMapIndexReader.SearchRequest; @@ -35,6 +29,11 @@ import net.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback; import net.osmand.osm.MapRenderingTypes; import net.osmand.osm.MapUtils; import net.osmand.osm.MultyPolygon; +import net.osmand.plus.OsmandSettings; +import net.osmand.plus.R; +import net.osmand.plus.RotatedTileBox; +import net.osmand.plus.activities.OsmandApplication; +import net.osmand.plus.render.OsmandRenderer.RenderingContext; import org.apache.commons.logging.Log; diff --git a/OsmAnd/src/net/osmand/plus/render/OsmandRenderer.java b/OsmAnd/src/net/osmand/plus/render/OsmandRenderer.java index 2b121ebdec..41381cafe6 100644 --- a/OsmAnd/src/net/osmand/plus/render/OsmandRenderer.java +++ b/OsmAnd/src/net/osmand/plus/render/OsmandRenderer.java @@ -11,12 +11,12 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import net.osmand.LogUtil; import net.osmand.binary.BinaryMapDataObject; import net.osmand.binary.BinaryMapIndexReader.TagValuePair; import net.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback; import net.osmand.osm.MapRenderingTypes; import net.osmand.osm.MultyPolygon; -import net.osmand.plus.LogUtil; import net.sf.junidecode.Junidecode; import org.apache.commons.logging.Log; diff --git a/OsmAnd/src/net/osmand/plus/render/RendererRegistry.java b/OsmAnd/src/net/osmand/plus/render/RendererRegistry.java index 4d15051fc5..8a52b0861e 100644 --- a/OsmAnd/src/net/osmand/plus/render/RendererRegistry.java +++ b/OsmAnd/src/net/osmand/plus/render/RendererRegistry.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import net.osmand.plus.LogUtil; +import net.osmand.LogUtil; import net.osmand.render.OsmandRenderingRulesParser; import org.apache.commons.logging.Log; diff --git a/OsmAnd/src/net/osmand/plus/views/AnimateDraggingMapThread.java b/OsmAnd/src/net/osmand/plus/views/AnimateDraggingMapThread.java index cb37cca758..36236a2b4e 100644 --- a/OsmAnd/src/net/osmand/plus/views/AnimateDraggingMapThread.java +++ b/OsmAnd/src/net/osmand/plus/views/AnimateDraggingMapThread.java @@ -1,7 +1,7 @@ package net.osmand.plus.views; +import net.osmand.LogUtil; import net.osmand.osm.MapUtils; -import net.osmand.plus.LogUtil; import org.apache.commons.logging.Log; diff --git a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java index dc41a7c252..d7dc4b82dd 100644 --- a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java @@ -4,9 +4,9 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; +import net.osmand.osm.LatLon; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; -import net.osmand.osm.LatLon; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; diff --git a/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java b/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java index b30ef165a2..dbc75bb086 100644 --- a/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java @@ -2,10 +2,10 @@ package net.osmand.plus.views; import java.util.List; -import net.osmand.plus.FavouritePoint; +import net.osmand.FavouritePoint; +import net.osmand.osm.LatLon; import net.osmand.plus.FavouritesDbHelper; import net.osmand.plus.R; -import net.osmand.osm.LatLon; import android.content.Context; import android.content.DialogInterface.OnClickListener; import android.graphics.Canvas; diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java index d89fb167cf..32a6e804c7 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java @@ -2,13 +2,13 @@ package net.osmand.plus.views; import net.osmand.Algoritms; import net.osmand.Messages; +import net.osmand.osm.LatLon; +import net.osmand.osm.MapUtils; import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.RoutingHelper.RouteDirectionInfo; import net.osmand.plus.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; diff --git a/OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java b/OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java index a0e277ac04..fbb84d1a17 100644 --- a/OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java +++ b/OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java @@ -2,7 +2,7 @@ package net.osmand.plus.views; import java.lang.reflect.Method; -import net.osmand.plus.LogUtil; +import net.osmand.LogUtil; import org.apache.commons.logging.Log; diff --git a/OsmAnd/src/net/osmand/plus/views/OsmBugsLayer.java b/OsmAnd/src/net/osmand/plus/views/OsmBugsLayer.java index d1d26d73d5..85a87e8d8f 100644 --- a/OsmAnd/src/net/osmand/plus/views/OsmBugsLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/OsmBugsLayer.java @@ -11,10 +11,10 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.osmand.plus.LogUtil; +import net.osmand.LogUtil; +import net.osmand.osm.LatLon; import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; -import net.osmand.osm.LatLon; import org.apache.commons.logging.Log; diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java index 4bdded9f43..aefac8f8d1 100644 --- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java +++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java @@ -6,6 +6,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import net.osmand.LogUtil; import net.osmand.data.preparation.MapTileDownloader; import net.osmand.data.preparation.MapTileDownloader.DownloadRequest; import net.osmand.data.preparation.MapTileDownloader.IMapDownloaderCallback; @@ -13,7 +14,6 @@ import net.osmand.map.IMapLocationListener; import net.osmand.map.ITileSource; import net.osmand.osm.LatLon; import net.osmand.osm.MapUtils; -import net.osmand.plus.LogUtil; import net.osmand.plus.OsmandSettings; import net.osmand.plus.ResourceManager; import net.osmand.plus.activities.OsmandApplication; @@ -28,23 +28,23 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; -import android.graphics.Paint.Style; import android.graphics.PointF; import android.graphics.Rect; import android.graphics.RectF; +import android.graphics.Paint.Style; import android.os.Handler; import android.os.Message; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.FloatMath; import android.view.GestureDetector; -import android.view.GestureDetector.OnDoubleTapListener; -import android.view.GestureDetector.OnGestureListener; import android.view.MotionEvent; import android.view.SurfaceHolder; -import android.view.SurfaceHolder.Callback; import android.view.SurfaceView; import android.view.WindowManager; +import android.view.GestureDetector.OnDoubleTapListener; +import android.view.GestureDetector.OnGestureListener; +import android.view.SurfaceHolder.Callback; public class OsmandMapTileView extends SurfaceView implements IMapDownloaderCallback, Callback, AnimateDraggingCallback, OnGestureListener, OnDoubleTapListener, MultiTouchZoomListener { diff --git a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java index 7e8a911322..94273575b3 100644 --- a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java @@ -3,14 +3,14 @@ package net.osmand.plus.views; import java.util.ArrayList; import java.util.List; -import net.osmand.plus.LogUtil; +import net.osmand.LogUtil; +import net.osmand.data.Amenity; +import net.osmand.osm.LatLon; import net.osmand.plus.OsmandSettings; import net.osmand.plus.PoiFilter; import net.osmand.plus.R; import net.osmand.plus.ResourceManager; import net.osmand.plus.activities.EditingPOIActivity; -import net.osmand.data.Amenity; -import net.osmand.osm.LatLon; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; diff --git a/OsmAnd/src/net/osmand/plus/views/RouteLayer.java b/OsmAnd/src/net/osmand/plus/views/RouteLayer.java index a6feb3e117..eca25ceeb2 100644 --- a/OsmAnd/src/net/osmand/plus/views/RouteLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/RouteLayer.java @@ -3,8 +3,8 @@ package net.osmand.plus.views; import java.util.ArrayList; import java.util.List; +import net.osmand.LogUtil; import net.osmand.osm.MapUtils; -import net.osmand.plus.LogUtil; import net.osmand.plus.activities.RoutingHelper; import android.graphics.Canvas; import android.graphics.Color; diff --git a/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java b/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java index 80d25e4b4e..b1127f30d5 100644 --- a/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java @@ -3,11 +3,11 @@ package net.osmand.plus.views; import java.util.ArrayList; import java.util.List; +import net.osmand.data.TransportStop; +import net.osmand.osm.LatLon; import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.TransportIndexRepository; -import net.osmand.data.TransportStop; -import net.osmand.osm.LatLon; import android.content.Context; import android.content.DialogInterface.OnClickListener; import android.graphics.Canvas; diff --git a/OsmAnd/src/net/osmand/plus/views/YandexTrafficLayer.java b/OsmAnd/src/net/osmand/plus/views/YandexTrafficLayer.java index e7a05000a4..1a7df165a5 100644 --- a/OsmAnd/src/net/osmand/plus/views/YandexTrafficLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/YandexTrafficLayer.java @@ -12,9 +12,9 @@ import java.util.Map; import java.util.Set; import net.osmand.Algoritms; -import net.osmand.plus.LogUtil; -import net.osmand.plus.R; +import net.osmand.LogUtil; import net.osmand.osm.MapUtils; +import net.osmand.plus.R; import org.apache.commons.logging.Log; diff --git a/OsmAnd/src/net/osmand/plus/voice/CommandPlayer.java b/OsmAnd/src/net/osmand/plus/voice/CommandPlayer.java index 8803b98e03..94afe41e0d 100644 --- a/OsmAnd/src/net/osmand/plus/voice/CommandPlayer.java +++ b/OsmAnd/src/net/osmand/plus/voice/CommandPlayer.java @@ -11,11 +11,10 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import net.osmand.plus.LogUtil; -import net.osmand.plus.OsmandSettings; +import net.osmand.LogUtil; +import net.osmand.data.index.IndexConstants; import net.osmand.plus.R; import net.osmand.plus.ResourceManager; -import net.osmand.data.index.IndexConstants; import org.apache.commons.logging.Log;