Changeset 6083 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2013-07-26T10:36:15+02:00 (11 years ago)

Author:

bastiK

Message:

see #8902 - Small performance enhancements (patch by shinigami)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (1 diff)
• layer/OsmDataLayer.java (modified) (1 diff)
• layer/geoimage/GeoImageLayer.java (modified) (1 diff)
• layer/geoimage/ImageDisplay.java (modified) (2 diffs)
• layer/gpx/ImportAudioAction.java (modified) (1 diff)
• layer/markerlayer/MarkerLayer.java (modified) (1 diff)
• mappaint/MapPaintStyles.java (modified) (1 diff)
• mappaint/xml/XmlStyleSourceHandler.java (modified) (1 diff)
• oauth/TestAccessTokenTask.java (modified) (1 diff)
• preferences/advanced/AdvancedPreference.java (modified) (2 diffs)
• preferences/projection/UTMProjectionChoice.java (modified) (2 diffs)
• preferences/server/ApiUrlTestTask.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -181 +181 @@
         }
 
-        Getopt g = new Getopt("JOSM", args, "hv", los.toArray(new LongOpt[0]));
+        Getopt g = new Getopt("JOSM", args, "hv", los.toArray(new LongOpt[los.size()]));
 
         Map<Option, Collection<String>> argMap = new HashMap<Option, Collection<String>>();

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -524 +524 @@
                 SeparatorLayerAction.INSTANCE,
                 new LayerListPopup.InfoAction(this)}));
-        return actions.toArray(new Action[0]);
+        return actions.toArray(new Action[actions.size()]);
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -301 +301 @@
         entries.add(new LayerListPopup.InfoAction(this));
 
-        return entries.toArray(new Action[0]);
+        return entries.toArray(new Action[entries.size()]);
 
     }

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

@@ -530 +530 @@
                 Color bkground = new Color(255, 255, 255, 128);
                 int lastPos = 0;
-                int pos = osdText.indexOf("\n");
+                int pos = osdText.indexOf('\n');
                 int x = 3;
                 int y = 3;
@@ -543 +543 @@
                     y += (int) lineSize.getHeight();
                     lastPos = pos + 1;
-                    pos = osdText.indexOf("\n", lastPos);
+                    pos = osdText.indexOf('\n', lastPos);
                 }
 

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java

@@ -249 +249 @@
                 wayPointFromTimeStamp.time = startTime;
                 String name = wavFile.getName();
-                int dot = name.lastIndexOf(".");
+                int dot = name.lastIndexOf('.');
                 if (dot > 0) {
                     name = name.substring(0, dot);

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -252 +252 @@
         components.add(SeparatorLayerAction.INSTANCE);
         components.add(new LayerListPopup.InfoAction(this));
-        return components.toArray(new Action[0]);
+        return components.toArray(new Action[components.size()]);
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -165 +165 @@
         {
             String[] a;
-            if(fileset.indexOf("=") >= 0) {
+            if(fileset.indexOf('=') >= 0) {
                 a = fileset.split("=", 2);
             } else {

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java

@@ -52 +52 @@
     Color convertColor(String colString)
     {
-        int i = colString.indexOf("#");
+        int i = colString.indexOf('#');
         Color ret;
         if (i < 0) {

trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java

@@ -92 +92 @@
         // remove trailing slashes
         while(url.endsWith("/")) {
-            url = url.substring(0, url.lastIndexOf("/"));
+            url = url.substring(0, url.lastIndexOf('/'));
         }
         return url;

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

@@ -349 +349 @@
                 for (File f: new File(".").listFiles()) {
                    String s = f.getName();
-                   int idx = s.indexOf("_");
+                   int idx = s.indexOf('_');
                    if (idx>=0) {
                         String t=s.substring(0,idx);
@@ -359 +359 @@
                 for (File f: Main.pref.getPreferencesDirFile().listFiles()) {
                    String s = f.getName();
-                   int idx = s.indexOf("_");
+                   int idx = s.indexOf('_');
                    if (idx>=0) {
                         String t=s.substring(0,idx);

trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java

@@ -110 +110 @@
             }
         }
-        return projections.toArray(new String[0]);
+        return projections.toArray(new String[projections.size()]);
     }
 
@@ -134 +134 @@
 
         if(args != null) {
-            String[] array = args.toArray(new String[0]);
+            String[] array = args.toArray(new String[args.size()]);
 
             if (array.length > 1) {

trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java

@@ -157 +157 @@
         String apiUrl = url.trim();
         while(apiUrl.endsWith("/")) {
-            apiUrl = apiUrl.substring(0, apiUrl.lastIndexOf("/"));
+            apiUrl = apiUrl.substring(0, apiUrl.lastIndexOf('/'));
         }
         return apiUrl;