summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjandegr <jandegr@users.noreply.github.com>2018-05-23 19:50:30 +0200
committerGitHub <noreply@github.com>2018-05-23 19:50:30 +0200
commit0c895e6d9ef6d4d98f89180b655c07ff17b807c3 (patch)
treefe475ef74090c3c44393c72279334945c957c217
parent356891feffa873cf9547ea187268a0d59c308989 (diff)
downloadnavit-0c895e6d9ef6d4d98f89180b655c07ff17b807c3.tar.gz
fix Array brackets at illegal position.
-rw-r--r--navit/android/src/org/navitproject/navit/Navit.java6
-rw-r--r--navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java10
-rw-r--r--navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java4
-rw-r--r--navit/android/src/org/navitproject/navit/NavitGraphics.java2
-rw-r--r--navit/android/src/org/navitproject/navit/NavitMapDownloader.java4
5 files changed, 13 insertions, 13 deletions
diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java
index 75a513ef1..9e1df6f1d 100644
--- a/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/android/src/org/navitproject/navit/Navit.java
@@ -464,7 +464,7 @@ public class Navit extends Activity
}
@Override
- public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+ public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
switch (requestCode) {
case MY_PERMISSIONS_REQUEST_ALL: {
if (grantResults.length > 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED
@@ -487,7 +487,7 @@ public class Navit extends Activity
}
private void parseNavigationURI(String schemeSpecificPart) {
- String naviData[]= schemeSpecificPart.split("&");
+ String[] naviData = schemeSpecificPart.split("&");
Pattern p = Pattern.compile("(.*)=(.*)");
Map<String,String> params = new HashMap<String,String>();
for (int count=0; count < naviData.length; count++) {
@@ -518,7 +518,7 @@ public class Navit extends Activity
if ( geoString != null) {
if (geoString.matches("^[+-]{0,1}\\d+(|\\.\\d*),[+-]{0,1}\\d+(|\\.\\d*)$")) {
- String geo[] = geoString.split(",");
+ String[] geo = geoString.split(",");
if (geo.length == 2) {
try {
lat = Float.valueOf(geo[0]);
diff --git a/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java b/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
index c174e3eba..48ff266d0 100644
--- a/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
+++ b/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java
@@ -105,13 +105,13 @@ public class NavitAddressSearchActivity extends Activity {
// We have all images stored as drawable_nodpi resources which allows native code to manipulate them
// without interference with android builtin choosing and scaling system. But that makes us to
// reinvent the wheel here to show an image in android native interface.
- int flag_icon_sizes[]={24,32,48,64,96};
+ int[] flag_icon_sizes = {24,32,48,64,96};
int exact_size, nearest_size;
- exact_size=(int)(Navit.metrics.density*24.0 -.5);
- nearest_size=flag_icon_sizes[0];
+ exact_size = (int)(Navit.metrics.density*24.0 -.5);
+ nearest_size = flag_icon_sizes[0];
for(int size: flag_icon_sizes) {
- nearest_size=size;
- if(exact_size<=size)
+ nearest_size = size;
+ if(exact_size <= size)
break;
}
mCountryButton.setImageResource(getDrawableID("country_" + mCountry+"_"+nearest_size+"_"+nearest_size));
diff --git a/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java b/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
index e32b48ace..365c0d312 100644
--- a/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
+++ b/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java
@@ -85,7 +85,7 @@ public class NavitDownloadSelectMapActivity extends ExpandableListActivity {
}
}
- private void updateMapsForLocation(NavitMapDownloader.osm_map_values osm_maps[]) {
+ private void updateMapsForLocation(NavitMapDownloader.osm_map_values[] osm_maps) {
Location currentLocation = NavitVehicle.lastLocation;
if (maps_current_position_childs.size() == 0 || (currentLocation != null
&& !currentLocationKnown)) {
@@ -139,7 +139,7 @@ public class NavitDownloadSelectMapActivity extends ExpandableListActivity {
private SimpleExpandableListAdapter createAdapter() {
- NavitMapDownloader.osm_map_values osm_maps[] = NavitMapDownloader.osm_maps;
+ NavitMapDownloader.osm_map_values[] osm_maps = NavitMapDownloader.osm_maps;
ArrayList<HashMap<String, String>> resultGroups = new ArrayList<HashMap<String, String>>();
ArrayList<ArrayList<HashMap<String, String>>> resultChilds =
diff --git a/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java
index e8394dfb8..eeecb1cc1 100644
--- a/navit/android/src/org/navitproject/navit/NavitGraphics.java
+++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java
@@ -913,7 +913,7 @@ public class NavitGraphics
paint.setPathEffect(null);
}
- protected void draw_polygon(Paint paint, int c[])
+ protected void draw_polygon(Paint paint, int[] )
{
paint.setStrokeWidth(c[0]);
paint.setARGB(c[1],c[2],c[3],c[4]);
diff --git a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
index 0c7d19ca8..08821175c 100644
--- a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
+++ b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
@@ -498,9 +498,9 @@ public class NavitMapDownloader extends Thread {
return (filename.endsWith(".bin"));
}
}
- NavitMap maps[] = new NavitMap[0];
+ NavitMap[] maps = new NavitMap[0];
File map_dir = new File(Navit.map_filename_path);
- String map_file_names[] = map_dir.list(new filterMaps());
+ String[] map_file_names = map_dir.list(new filterMaps());
if (map_file_names != null) {
maps = new NavitMap[map_file_names.length];
for (int map_file_index = 0; map_file_index < map_file_names.length; map_file_index++) {