From 7f5e74da0526644610db4af688e02dcf0ea922cf Mon Sep 17 00:00:00 2001 From: GaidamakUA Date: Mon, 7 Dec 2015 10:30:46 +0200 Subject: [PATCH] Imports optimization --- .../net/osmand/binary/GeocodingUtilities.java | 28 ++++++++-------- .../osmand/plus/CurrentPositionHelper.java | 32 ++++++++----------- .../mapcontextmenu/MenuTitleController.java | 2 +- 3 files changed, 29 insertions(+), 33 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/binary/GeocodingUtilities.java b/OsmAnd-java/src/net/osmand/binary/GeocodingUtilities.java index a749602f7d..f1617e4179 100644 --- a/OsmAnd-java/src/net/osmand/binary/GeocodingUtilities.java +++ b/OsmAnd-java/src/net/osmand/binary/GeocodingUtilities.java @@ -1,19 +1,5 @@ package net.osmand.binary; -import gnu.trove.set.hash.TLongHashSet; - -import java.io.IOException; -import java.text.Collator; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; - import net.osmand.PlatformUtil; import net.osmand.ResultMatcher; import net.osmand.binary.BinaryMapIndexReader.SearchRequest; @@ -32,6 +18,20 @@ import net.osmand.util.MapUtils; import org.apache.commons.logging.Log; +import java.io.IOException; +import java.text.Collator; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; + +import gnu.trove.set.hash.TLongHashSet; + public class GeocodingUtilities { private static final Log log = PlatformUtil.getLog(GeocodingUtilities.class); diff --git a/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java b/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java index e3adcb0929..0ab8ce48dc 100644 --- a/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java +++ b/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java @@ -1,5 +1,19 @@ package net.osmand.plus; +import net.osmand.Location; +import net.osmand.ResultMatcher; +import net.osmand.binary.BinaryMapIndexReader; +import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteRegion; +import net.osmand.binary.GeocodingUtilities; +import net.osmand.binary.GeocodingUtilities.GeocodingResult; +import net.osmand.binary.RouteDataObject; +import net.osmand.plus.resources.RegionAddressRepository; +import net.osmand.router.GeneralRouter.GeneralRouterProfile; +import net.osmand.router.RoutePlannerFrontEnd; +import net.osmand.router.RoutingConfiguration; +import net.osmand.router.RoutingContext; +import net.osmand.util.MapUtils; + import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -7,24 +21,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; -import net.osmand.Location; -import net.osmand.ResultMatcher; -import net.osmand.binary.BinaryMapIndexReader; -import net.osmand.binary.GeocodingUtilities; -import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteRegion; -import net.osmand.binary.GeocodingUtilities.GeocodingResult; -import net.osmand.binary.RouteDataObject; -import net.osmand.osm.edit.Node; -import net.osmand.osm.edit.OSMSettings.OSMTagKey; -import net.osmand.plus.resources.RegionAddressRepository; -import net.osmand.router.BinaryRoutePlanner.RouteSegment; -import net.osmand.router.BinaryRoutePlanner.RouteSegmentPoint; -import net.osmand.router.GeneralRouter.GeneralRouterProfile; -import net.osmand.router.RoutePlannerFrontEnd; -import net.osmand.router.RoutingConfiguration; -import net.osmand.router.RoutingContext; -import net.osmand.util.MapUtils; - public class CurrentPositionHelper { private RouteDataObject lastFound; diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuTitleController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuTitleController.java index f9b455ed43..9f3cb80cb6 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuTitleController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuTitleController.java @@ -1,6 +1,7 @@ package net.osmand.plus.mapcontextmenu; import android.graphics.drawable.Drawable; + import net.osmand.Location; import net.osmand.ResultMatcher; import net.osmand.binary.GeocodingUtilities.GeocodingResult; @@ -10,7 +11,6 @@ import net.osmand.data.PointDescription; import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; -import net.osmand.plus.routing.RoutingHelper; import net.osmand.util.Algorithms; public abstract class MenuTitleController {