Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Package/class renaming

Browse source
This commit is contained in:
Victor Shcherb 2013-01-29 19:13:03 +01:00
parent 64a3356845
commit 555322a108
24 changed files with 33 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/AmenityIndexRepositoryOdb.java
View file

@ -12,11 +12,11 @@ import java.util.List;
import java.util.Map;
import net.osmand.IProgress;
import net.osmand.IndexConstants;
import net.osmand.PlatformUtil;
import net.osmand.ResultMatcher;
import net.osmand.data.Amenity;
import net.osmand.data.AmenityType;
import net.osmand.data.IndexConstants;
import net.osmand.osm.Entity;
import net.osmand.osm.LatLon;
import net.osmand.osm.MapRenderingTypes;

4
OsmAnd/src/net/osmand/plus/OsmandApplication.java
View file

@ -11,10 +11,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import net.osmand.FavouritePoint;
import net.osmand.IndexConstants;
import net.osmand.PlatformUtil;
import net.osmand.access.AccessibleToast;
import net.osmand.data.IndexConstants;
import net.osmand.data.FavouritePoint;
import net.osmand.plus.GPXUtilities.GPXFile;
import net.osmand.plus.GPXUtilities.WptPt;
import net.osmand.plus.activities.DayNightHelper;

2
OsmAnd/src/net/osmand/plus/ResourceManager.java
View file

@ -21,13 +21,13 @@ import java.util.TreeMap;
import net.osmand.GeoidAltitudeCorrection;
import net.osmand.IProgress;
import net.osmand.IndexConstants;
import net.osmand.PlatformUtil;
import net.osmand.ResultMatcher;
import net.osmand.binary.BinaryMapIndexReader;
import net.osmand.binary.CachedOsmandIndexes;
import net.osmand.data.Amenity;
import net.osmand.data.AmenityType;
import net.osmand.data.IndexConstants;
import net.osmand.data.TransportStop;
import net.osmand.map.ITileSource;
import net.osmand.map.MapTileDownloader;

2
OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
View file

@ -7,8 +7,8 @@ import java.nio.ByteBuffer;
import java.text.MessageFormat;
import java.util.List;
import net.osmand.IndexConstants;
import net.osmand.PlatformUtil;
import net.osmand.data.IndexConstants;
import net.osmand.map.ITileSource;
import net.osmand.map.TileSourceManager.TileSourceTemplate;
import net.osmand.plus.api.SQLiteAPI.SQLiteConnection;

13
OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java
View file

@ -1,9 +1,6 @@
package net.osmand.plus.activities;
import static net.osmand.data.IndexConstants.BINARY_MAP_INDEX_EXT;
import static net.osmand.data.IndexConstants.EXTRA_EXT;
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
@ -15,9 +12,9 @@ import java.util.Map;
import java.util.TreeMap;
import net.osmand.IProgress;
import net.osmand.IndexConstants;
import net.osmand.PlatformUtil;
import net.osmand.access.AccessibleToast;
import net.osmand.data.IndexConstants;
import net.osmand.map.RegionCountry;
import net.osmand.map.RegionRegistry;
import net.osmand.plus.ClientContext;
@ -498,11 +495,11 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
private Map<String, String> listAlreadyDownloadedWithAlternatives() {
Map<String, String> files = new TreeMap<String, String>();
listWithAlternatives(getMyApplication().getAppPath(IndexConstants.BACKUP_INDEX_DIR),BINARY_MAP_INDEX_EXT, files);
listWithAlternatives(getMyApplication().getAppPath(IndexConstants.MAPS_PATH),BINARY_MAP_INDEX_EXT, files);
listWithAlternatives(getMyApplication().getAppPath(IndexConstants.MAPS_PATH),EXTRA_EXT, files);
listWithAlternatives(getMyApplication().getAppPath(IndexConstants.BACKUP_INDEX_DIR),IndexConstants.BINARY_MAP_INDEX_EXT, files);
listWithAlternatives(getMyApplication().getAppPath(IndexConstants.MAPS_PATH),IndexConstants.BINARY_MAP_INDEX_EXT, files);
listWithAlternatives(getMyApplication().getAppPath(IndexConstants.MAPS_PATH),IndexConstants.EXTRA_EXT, files);
if(OsmandPlugin.getEnabledPlugin(SRTMPlugin.class) != null) {
listWithAlternatives(getMyApplication().getAppPath(IndexConstants.SRTM_INDEX_DIR),BINARY_MAP_INDEX_EXT, files);
listWithAlternatives(getMyApplication().getAppPath(IndexConstants.SRTM_INDEX_DIR),IndexConstants.BINARY_MAP_INDEX_EXT, files);
}
listWithAlternatives(getMyApplication().getAppPath(IndexConstants.VOICE_INDEX_DIR),"", files);
return files;

2
OsmAnd/src/net/osmand/plus/activities/FavouritesActivity.java
View file

@ -17,8 +17,8 @@ import java.util.Set;
import net.londatiga.android.ActionItem;
import net.londatiga.android.QuickAction;
import net.osmand.FavouritePoint;
import net.osmand.access.AccessibleToast;
import net.osmand.data.FavouritePoint;
import net.osmand.osm.LatLon;
import net.osmand.osm.MapUtils;
import net.osmand.plus.FavouritesDbHelper;

2
OsmAnd/src/net/osmand/plus/activities/FavouritesListActivity.java
View file

@ -7,7 +7,7 @@ import java.util.Comparator;
import java.util.List;
import net.londatiga.android.QuickAction;
import net.osmand.FavouritePoint;
import net.osmand.data.FavouritePoint;
import net.osmand.osm.LatLon;
import net.osmand.osm.MapUtils;
import net.osmand.plus.ClientContext;

2
OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java
View file

@ -13,6 +13,7 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import net.osmand.IndexConstants;
import net.osmand.binary.BinaryIndexPart;
import net.osmand.binary.BinaryMapAddressReaderAdapter.AddressRegion;
import net.osmand.binary.BinaryMapIndexReader;
@ -21,7 +22,6 @@ import net.osmand.binary.BinaryMapIndexReader.MapRoot;
import net.osmand.binary.BinaryMapPoiReaderAdapter.PoiRegion;
import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteRegion;
import net.osmand.binary.BinaryMapTransportReaderAdapter.TransportIndex;
import net.osmand.data.IndexConstants;
import net.osmand.map.TileSourceManager;
import net.osmand.map.TileSourceManager.TileSourceTemplate;
import net.osmand.osm.MapUtils;

2
OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
View file

@ -11,8 +11,8 @@ import java.util.Map;
import java.util.Set;
import net.osmand.IProgress;
import net.osmand.IndexConstants;
import net.osmand.access.AccessibleToast;
import net.osmand.data.IndexConstants;
import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
import net.osmand.plus.GPXUtilities.WptPt;

4
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -16,13 +16,13 @@ import net.londatiga.android.ActionItem;
import net.londatiga.android.QuickAction;
import net.osmand.AndroidUtils;
import net.osmand.CallbackWithObject;
import net.osmand.FavouritePoint;
import net.osmand.IndexConstants;
import net.osmand.Location;
import net.osmand.PlatformUtil;
import net.osmand.access.AccessibleAlertBuilder;
import net.osmand.access.AccessibleToast;
import net.osmand.data.Amenity;
import net.osmand.data.IndexConstants;
import net.osmand.data.FavouritePoint;
import net.osmand.map.ITileSource;
import net.osmand.osm.LatLon;
import net.osmand.osm.MapUtils;

2
OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
View file

@ -11,10 +11,10 @@ import java.util.Map;
import java.util.Map.Entry;
import net.osmand.CallbackWithObject;
import net.osmand.IndexConstants;
import net.osmand.ResultMatcher;
import net.osmand.access.AccessibleToast;
import net.osmand.data.AmenityType;
import net.osmand.data.IndexConstants;
import net.osmand.map.ITileSource;
import net.osmand.map.TileSourceManager.TileSourceTemplate;
import net.osmand.plus.ContextMenuAdapter;

2
OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
View file

@ -8,8 +8,8 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import net.osmand.IndexConstants;
import net.osmand.PlatformUtil;
import net.osmand.data.IndexConstants;
import net.osmand.osm.LatLon;
import net.osmand.plus.GPXUtilities;
import net.osmand.plus.GPXUtilities.GPXFile;

2
OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
View file

@ -10,9 +10,9 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import net.osmand.IndexConstants;
import net.osmand.ResultMatcher;
import net.osmand.access.AccessibleToast;
import net.osmand.data.IndexConstants;
import net.osmand.map.TileSourceManager;
import net.osmand.map.TileSourceManager.TileSourceTemplate;
import net.osmand.plus.ApplicationMode;

2
OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
View file

@ -6,7 +6,7 @@ import java.util.Arrays;
import java.util.Formatter;
import java.util.Locale;
import net.osmand.FavouritePoint;
import net.osmand.data.FavouritePoint;
import net.osmand.osm.LatLon;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;

2
OsmAnd/src/net/osmand/plus/activities/search/SearchStreet2ByNameActivity.java
View file

@ -4,11 +4,11 @@ import java.util.Comparator;
import java.util.List;
import net.osmand.data.City;
import net.osmand.data.MapObjectComparator;
import net.osmand.data.Street;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.RegionAddressRepository;
import net.osmand.util.MapObjectComparator;
import android.os.AsyncTask;
import android.view.View;

2
OsmAnd/src/net/osmand/plus/activities/search/SearchStreetByNameActivity.java
View file

@ -10,11 +10,11 @@ import net.osmand.CollatorStringMatcher;
import net.osmand.CollatorStringMatcher.StringMatcherMode;
import net.osmand.ResultMatcher;
import net.osmand.data.City;
import net.osmand.data.MapObjectComparator;
import net.osmand.data.Street;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.RegionAddressRepository;
import net.osmand.util.MapObjectComparator;
import android.os.AsyncTask;
import android.os.Message;
import android.view.View;

2
OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
View file

@ -15,12 +15,12 @@ import java.util.List;
import java.util.Map;
import net.osmand.IProgress;
import net.osmand.IndexConstants;
import net.osmand.Location;
import net.osmand.PlatformUtil;
import net.osmand.access.AccessibleAlertBuilder;
import net.osmand.access.AccessibleToast;
import net.osmand.data.DataTileManager;
import net.osmand.data.IndexConstants;
import net.osmand.osm.LatLon;
import net.osmand.osm.MapUtils;
import net.osmand.plus.ApplicationMode;

10
OsmAnd/src/net/osmand/plus/download/DownloadIndexAdapter.java
View file

@ -1,18 +1,14 @@
package net.osmand.plus.download;
import static net.osmand.data.IndexConstants.EXTRA_EXT;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import net.osmand.data.IndexConstants;
import net.osmand.IndexConstants;
import net.osmand.plus.ClientContext;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.ResourceManager;
import net.osmand.plus.activities.DownloadIndexActivity;
import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
import android.graphics.Color;
@ -50,10 +46,10 @@ public class DownloadIndexAdapter extends OsmandBaseExpandableListAdapter implem
public void updateLoadedFiles() {
indexActivatedFileNames = getMyApplication().getResourceManager().getIndexFileNames();
DownloadIndexActivity.listWithAlternatives(getMyApplication().getAppPath(""),
EXTRA_EXT, indexActivatedFileNames);
IndexConstants.EXTRA_EXT, indexActivatedFileNames);
indexFileNames = getMyApplication().getResourceManager().getIndexFileNames();
DownloadIndexActivity.listWithAlternatives(getMyApplication().getAppPath(""),
EXTRA_EXT, indexFileNames);
IndexConstants.EXTRA_EXT, indexFileNames);
getMyApplication().getResourceManager().getBackupIndexes(indexFileNames);
}

2
OsmAnd/src/net/osmand/plus/download/DownloadOsmandIndexesHelper.java
View file

@ -7,8 +7,8 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import net.osmand.IndexConstants;
import net.osmand.PlatformUtil;
import net.osmand.data.IndexConstants;
import net.osmand.plus.ClientContext;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;

4
OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java
View file

@ -22,14 +22,13 @@ import java.util.Set;
import net.osmand.IProgress;
import net.osmand.NativeLibrary.NativeSearchResult;
import net.osmand.PlatformUtil;
import net.osmand.QuadRect;
import net.osmand.access.AccessibleToast;
import net.osmand.binary.BinaryMapDataObject;
import net.osmand.binary.BinaryMapIndexReader;
import net.osmand.binary.BinaryMapIndexReader.MapIndex;
import net.osmand.binary.BinaryMapIndexReader.SearchRequest;
import net.osmand.binary.BinaryMapIndexReader.TagValuePair;
import net.osmand.data.MapAlgorithms;
import net.osmand.data.QuadRect;
import net.osmand.map.MapTileDownloader.IMapDownloaderCallback;
import net.osmand.osm.MapUtils;
import net.osmand.plus.OsmandApplication;
@ -44,6 +43,7 @@ import net.osmand.render.RenderingRuleSearchRequest;
import net.osmand.render.RenderingRuleStorageProperties;
import net.osmand.render.RenderingRulesStorage;
import net.osmand.util.Algorithms;
import net.osmand.util.MapAlgorithms;
import org.apache.commons.logging.Log;

2
OsmAnd/src/net/osmand/plus/render/TextRenderer.java
View file

@ -8,9 +8,9 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import net.osmand.QuadRect;
import net.osmand.binary.BinaryMapDataObject;
import net.osmand.binary.BinaryMapIndexReader.TagValuePair;
import net.osmand.data.QuadRect;
import net.osmand.data.QuadTree;
import net.osmand.plus.render.OsmandRenderer.RenderingContext;
import net.osmand.render.RenderingRuleSearchRequest;

2
OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java
View file

@ -3,8 +3,8 @@ package net.osmand.plus.views;
import java.util.ArrayList;
import java.util.List;
import net.osmand.FavouritePoint;
import net.osmand.access.AccessibleToast;
import net.osmand.data.FavouritePoint;
import net.osmand.osm.LatLon;
import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;

2
OsmAnd/src/net/osmand/plus/views/YandexTrafficAdapter.java
View file

@ -7,9 +7,9 @@ import java.io.File;
import java.io.IOException;
import java.net.URL;
import net.osmand.IndexConstants;
import net.osmand.PlatformUtil;
import net.osmand.access.AccessibleToast;
import net.osmand.data.IndexConstants;
import net.osmand.map.TileSourceManager.TileSourceTemplate;
import net.osmand.plus.R;
import net.osmand.util.Algorithms;

2
OsmAnd/src/net/osmand/plus/voice/CommandPlayerFactory.java
View file

@ -2,7 +2,7 @@ package net.osmand.plus.voice;
import java.io.File;
import net.osmand.data.IndexConstants;
import net.osmand.IndexConstants;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import android.app.Activity;