Fix compilation problems

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;
 

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;

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;

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;

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;

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;

OsmAnd/src/net/osmand/LogUtil.java

@@ -1,4 +1,4 @@
-package net.osmand.plus;
+package net.osmand;
 
 import org.apache.commons.logging.Log;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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.plus.DownloadOsmandIndexesHelper.IndexItem;
-import net.osmand.data.index.IndexConstants;
 
 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;

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.LogUtil;
-import net.osmand.plus.R;
-import net.osmand.plus.ResourceManager;
-import net.osmand.plus.views.OsmandMapTileView;
 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;
 

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;

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.LogUtil;
-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.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;

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;

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;

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<net.osmand.plus.FavouritePoint> pts = new ArrayList<FavouritePoint>();
+								List<FavouritePoint> pts = new ArrayList<FavouritePoint>();
 								for(WptPt p : res.wayPoints){
 									FavouritePoint pt = new FavouritePoint();
 									pt.setLatitude(p.lat);

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;

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;

OsmAnd/src/net/osmand/plus/activities/OsmandApplication.java

@@ -9,8 +9,8 @@ import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.List;
 
 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;

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.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.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;

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;

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.GPXUtilities;
-import net.osmand.plus.LogUtil;
+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;
 

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 {

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;

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;

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.LogUtil;
-import net.osmand.plus.OsmandSettings;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.MapActivity;
 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;

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;

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;
 

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;

OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java

@@ -9,18 +9,18 @@ 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;

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;

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;

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;

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;

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;

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.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.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;
 

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;

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;

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;
 

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;

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;

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;

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;
 

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;
 

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 {

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;

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;

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;

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.LogUtil;
-import net.osmand.plus.R;
 import net.osmand.osm.MapUtils;
+import net.osmand.plus.R;
 
 import org.apache.commons.logging.Log;
 

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.LogUtil;
-import net.osmand.plus.OsmandSettings;
+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;