From ca8011817492c0da9b5baa5eb231ede06114d9e6 Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 30 Aug 2012 01:55:58 +0200 Subject: [PATCH] remove remaining displays of Osmand vs. OsmAnd --- DataExtractionOSM/src/net/osmand/Algoritms.java | 4 ++-- DataExtractionOSM/src/net/osmand/MapCreatorVersion.java | 2 +- .../src/net/osmand/binary/BinaryInspector.java | 6 +++--- .../src/net/osmand/data/MapTileDownloader.java | 2 +- .../src/net/osmand/osm/OpeningHoursParser.java | 2 +- DataExtractionOSM/src/net/osmand/swing/MapRouterLayer.java | 4 ++-- OsmAnd/src/net/osmand/plus/OsmandApplication.java | 2 +- OsmAnd/src/net/osmand/plus/OsmandSettings.java | 2 +- OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java | 2 +- .../net/osmand/plus/monitoring/OsmandMonitoringPlugin.java | 2 +- OsmAnd/src/net/osmand/plus/routing/RouteProvider.java | 4 ++-- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/DataExtractionOSM/src/net/osmand/Algoritms.java b/DataExtractionOSM/src/net/osmand/Algoritms.java index 1d792f4685..f4250695f1 100644 --- a/DataExtractionOSM/src/net/osmand/Algoritms.java +++ b/DataExtractionOSM/src/net/osmand/Algoritms.java @@ -258,7 +258,7 @@ public class Algoritms { conn.setRequestProperty("Authorization", "Basic " + Base64.encode(userNamePassword)); //$NON-NLS-1$ //$NON-NLS-2$ } - conn.setRequestProperty("User-Agent", "Osmand"); //$NON-NLS-1$ //$NON-NLS-2$ + conn.setRequestProperty("User-Agent", "OsmAnd"); //$NON-NLS-1$ //$NON-NLS-2$ log.info("Response code and message : " + conn.getResponseCode() + " " + conn.getResponseMessage()); if(conn.getResponseCode() != 200){ return conn.getResponseMessage(); @@ -312,7 +312,7 @@ public class Algoritms { } conn.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + BOUNDARY); //$NON-NLS-1$ //$NON-NLS-2$ - conn.setRequestProperty("User-Agent", "Osmand"); //$NON-NLS-1$ //$NON-NLS-2$ + conn.setRequestProperty("User-Agent", "OsmAnd"); //$NON-NLS-1$ //$NON-NLS-2$ OutputStream ous = conn.getOutputStream(); // for (String key : additionalMapData.keySet()) { diff --git a/DataExtractionOSM/src/net/osmand/MapCreatorVersion.java b/DataExtractionOSM/src/net/osmand/MapCreatorVersion.java index be90a80f99..37881f19d5 100644 --- a/DataExtractionOSM/src/net/osmand/MapCreatorVersion.java +++ b/DataExtractionOSM/src/net/osmand/MapCreatorVersion.java @@ -8,7 +8,7 @@ public class MapCreatorVersion { public static String APP_VERSION = "0.8.3"; //$NON-NLS-1$ public static final String APP_DESCRIPTION = "alpha"; //$NON-NLS-1$ - public static final String APP_MAP_CREATOR_NAME = "OsmandMapCreator"; //$NON-NLS-1$ + public static final String APP_MAP_CREATOR_NAME = "OsmAndMapCreator"; //$NON-NLS-1$ public static final String APP_MAP_CREATOR_VERSION = APP_MAP_CREATOR_NAME + " " + APP_VERSION; //$NON-NLS-1$ public static final String APP_MAP_CREATOR_FULL_NAME = APP_MAP_CREATOR_NAME + " " + APP_VERSION + " " +APP_DESCRIPTION; //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/DataExtractionOSM/src/net/osmand/binary/BinaryInspector.java b/DataExtractionOSM/src/net/osmand/binary/BinaryInspector.java index 26ffc032dd..dbacef62f1 100644 --- a/DataExtractionOSM/src/net/osmand/binary/BinaryInspector.java +++ b/DataExtractionOSM/src/net/osmand/binary/BinaryInspector.java @@ -333,7 +333,7 @@ public class BinaryInspector { public static void printFileInformation(String fileName,VerboseInfo verbose) throws IOException { File file = new File(fileName); if(!file.exists()){ - println("Binary Osmand index " + fileName + " was not found."); + println("Binary OsmAnd index " + fileName + " was not found."); return; } printFileInformation(file,verbose); @@ -573,10 +573,10 @@ public class BinaryInspector { if(warning != null){ println(warning); } - println("Inspector is console utility for working with binary indexes of Osmand."); + println("Inspector is console utility for working with binary indexes of OsmAnd."); println("It allows print info about file, extract parts and merge indexes."); println("\nUsage for print info : inspector [-vaddress] [-vmap] [-vpoi] [-vtransport] [-zoom=Zoom] [-bbox=LeftLon,TopLat,RightLon,BottomLan] [file]"); - println(" Prints information about [file] binary index of Osmand."); + println(" Prints information about [file] binary index of OsmAnd."); println(" -v.. more verbouse output (like all cities and their streets or all map objects with tags/values and coordinates)"); println("\nUsage for combining indexes : inspector -c file_to_create (file_from_extract ((+|-)parts_to_extract)? )*"); println("\tCreate new file of extracted parts from input file. [parts_to_extract] could be parts to include or exclude."); diff --git a/DataExtractionOSM/src/net/osmand/data/MapTileDownloader.java b/DataExtractionOSM/src/net/osmand/data/MapTileDownloader.java index e07a771d6e..204da05d84 100644 --- a/DataExtractionOSM/src/net/osmand/data/MapTileDownloader.java +++ b/DataExtractionOSM/src/net/osmand/data/MapTileDownloader.java @@ -33,7 +33,7 @@ public class MapTileDownloader { private static MapTileDownloader downloader = null; private static Log log = LogUtil.getLog(MapTileDownloader.class); - public static String USER_AGENT = "Osmand~"; + public static String USER_AGENT = "OsmAnd~"; private ThreadPoolExecutor threadPoolExecutor; diff --git a/DataExtractionOSM/src/net/osmand/osm/OpeningHoursParser.java b/DataExtractionOSM/src/net/osmand/osm/OpeningHoursParser.java index 23f56280ad..7d8ace0d8f 100644 --- a/DataExtractionOSM/src/net/osmand/osm/OpeningHoursParser.java +++ b/DataExtractionOSM/src/net/osmand/osm/OpeningHoursParser.java @@ -26,7 +26,7 @@ public class OpeningHoursParser { * hour of when you would expect a day to be ended. * This is to be used when no end hour is known (like pubs that open at a certain time, * but close at a variable time, depending on the number of clients). - * Osmand needs to show a value, so there is some arbitrary default value chosen. + * OsmAnd needs to show a value, so there is some arbitrary default value chosen. */ private static String endOfDay = "24:00"; diff --git a/DataExtractionOSM/src/net/osmand/swing/MapRouterLayer.java b/DataExtractionOSM/src/net/osmand/swing/MapRouterLayer.java index 38212b29d2..c4a0c279bb 100644 --- a/DataExtractionOSM/src/net/osmand/swing/MapRouterLayer.java +++ b/DataExtractionOSM/src/net/osmand/swing/MapRouterLayer.java @@ -166,7 +166,7 @@ public class MapRouterLayer implements MapPanelLayer { } }; menu.add(end); - Action selfRoute = new AbstractAction("Calculate Osmand route") { + Action selfRoute = new AbstractAction("Calculate OsmAnd route") { private static final long serialVersionUID = 507156107455281238L; @Override @@ -189,7 +189,7 @@ public class MapRouterLayer implements MapPanelLayer { } }; - Action recalculate = new AbstractAction("Recalculate Osmand route") { + Action recalculate = new AbstractAction("Recalculate OsmAnd route") { private static final long serialVersionUID = 507156107455281238L; @Override diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java index 4752dded6d..b443c8bf44 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java +++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java @@ -253,7 +253,7 @@ public class OsmandApplication extends Application { SpecialPhrases.setLanguage(this, osmandSettings); } catch (IOException e) { LOG.error("I/O exception", e); - Toast error = Toast.makeText(this, "Error while reading the special phrases. Restart Osmand if possible", Toast.LENGTH_LONG); + Toast error = Toast.makeText(this, "Error while reading the special phrases. Restart OsmAnd if possible", Toast.LENGTH_LONG); error.show(); } diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index 54d1302f09..09f7eba4b9 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -541,7 +541,7 @@ public class OsmandSettings { // this value string is synchronized with settings_pref.xml preference name public final OsmandPreference USER_OSM_BUG_NAME = - new StringPreference("user_osm_bug_name", "NoName/Osmand").makeGlobal(); + new StringPreference("user_osm_bug_name", "NoName/OsmAnd").makeGlobal(); // this value string is synchronized with settings_pref.xml preference name public final OsmandPreference USER_PASSWORD = diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java index 2f03d1df09..a218ec40e5 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java @@ -68,7 +68,7 @@ public class MainMenuActivity extends Activity { intent.putExtra(Intent.EXTRA_EMAIL, new String[] { "osmand.app@gmail.com" }); //$NON-NLS-1$ intent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file)); intent.setType("vnd.android.cursor.dir/email"); //$NON-NLS-1$ - intent.putExtra(Intent.EXTRA_SUBJECT, "Osmand bug"); //$NON-NLS-1$ + intent.putExtra(Intent.EXTRA_SUBJECT, "OsmAnd bug"); //$NON-NLS-1$ StringBuilder text = new StringBuilder(); text.append("\nDevice : ").append(Build.DEVICE); //$NON-NLS-1$ text.append("\nBrand : ").append(Build.BRAND); //$NON-NLS-1$ diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java index 2d526fa98a..049da2f162 100644 --- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java @@ -113,7 +113,7 @@ public class OsmandMonitoringPlugin extends OsmandPlugin implements LockInfoCont public void settingsActivityCreate(final SettingsActivity activity, PreferenceScreen screen) { Preference offlineData = screen.findPreference("local_indexes"); if (offlineData == null) { - log.error("OsmandMonitoringPlugin: Index settings preference not found !"); + log.error("OsmAndMonitoringPlugin: Index settings preference not found !"); } else { offlineData.setSummary(offlineData.getSummary() + " " + app.getString(R.string.gpx_index_settings_descr)); } diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java index 071f3ef91d..3104ba3e65 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java +++ b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java @@ -58,10 +58,10 @@ import android.location.Location; public class RouteProvider { private static final org.apache.commons.logging.Log log = LogUtil.getLog(RouteProvider.class); - private static final String OSMAND_ROUTER = "OsmandRouter"; + private static final String OSMAND_ROUTER = "OsmAndRouter"; public enum RouteService { - OSMAND("Osmand (offline)"), CLOUDMADE("CloudMade"), YOURS("YOURS"), ORS("OpenRouteService"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + OSMAND("OsmAnd (offline)"), CLOUDMADE("CloudMade"), YOURS("YOURS"), ORS("OpenRouteService"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ private final String name; private RouteService(String name){ this.name = name;