Ticket #8902: indexOf.diff

src/org/openstreetmap/josm/actions/RenameLayerAction.java

@@ -77 +77 @@
             Main.pref.put("layer.rename-file", filerename.isSelected());
             if (filerename.isSelected()) {
                 String newname = nameText;
-                if (newname.indexOf("/") == -1 && newname.indexOf("\\") == -1) {
+                if (newname.indexOf('/') == -1 && newname.indexOf('\\') == -1) {
                     newname = file.getParent() + File.separator + newname;
                 }
                 String oldname = file.getName();

src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -244 +244 @@
                             ignoreDataEndsWith.add(line);
                         } else if (key.equals("K:")) {
                             IgnoreKeyPair tmp = new IgnoreKeyPair();
-                            int mid = line.indexOf("=");
+                            int mid = line.indexOf('=');
                             tmp.key = line.substring(0, mid);
                             tmp.value = line.substring(mid+1);
                             ignoreDataKeyPair.add(tmp);
@@ -401 +401 @@
                         tr(s, key), MessageFormat.format(s, key), INVALID_KEY, p) );
                 withErrors.put(p, "IPK");
             }
-            if (checkKeys && key.indexOf(" ") >= 0 && !withErrors.contains(p, "IPK")) {
+            if (checkKeys && key.indexOf(' ') >= 0 && !withErrors.contains(p, "IPK")) {
                 errors.add( new TestError(this, Severity.WARNING, tr("Invalid white space in property key"),
                         tr(s, key), MessageFormat.format(s, key), INVALID_KEY_SPACE, p) );
                 withErrors.put(p, "IPK");

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

@@ -529 +529 @@
                 int ascent = metrics.getAscent();
                 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;
                 String line;
@@ -542 +542 @@
                     g.drawString(line, x, y + ascent);
                     y += (int) lineSize.getHeight();
                     lastPos = pos + 1;
-                    pos = osdText.indexOf("\n", lastPos);
+                    pos = osdText.indexOf('\n', lastPos);
                 }
 
                 line = osdText.substring(lastPos);

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

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

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

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

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

@@ -51 +51 @@
 
     Color convertColor(String colString)
     {
-        int i = colString.indexOf("#");
+        int i = colString.indexOf('#');
         Color ret;
         if (i < 0) {
             ret = Main.pref.getColor("mappaint."+style.getPrefName()+"."+colString, Color.red);

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

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

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

@@ -348 +348 @@
                 p.removeAll();
                 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);
                         System.out.println(t);
@@ -358 +358 @@
                 }
                 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);
                         if (profileTypes.containsKey(t))

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

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

src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -1119 +1119 @@
         int pos = stack.length;
         for (PluginProxy p : pluginList) {
             String baseClass = p.getPluginInformation().className;
-            baseClass = baseClass.substring(0, baseClass.lastIndexOf("."));
+            baseClass = baseClass.substring(0, baseClass.lastIndexOf('.'));
             for (int elpos = 0; elpos < pos; ++elpos) {
                 if (stack[elpos].getClassName().startsWith(baseClass)) {
                     pos = elpos;

src/org/openstreetmap/josm/plugins/PluginInformation.java

@@ -229 +229 @@
                         if(mv <= myv && (mv > mainversion || mainversion > myv))
                         {
                             String v = (String)entry.getValue();
-                            int i = v.indexOf(";");
+                            int i = v.indexOf(';');
                             if(i > 0)
                             {
                                 downloadlink = v.substring(i+1);

src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java

@@ -121 +121 @@
                             if(urltext.length() > maxlen)
                             {
                                 urltext = urltext.substring(0,maxlen);
-                                int idx = urltext.lastIndexOf("\n");
+                                int idx = urltext.lastIndexOf('\n');
                                 /* cut whole line when not loosing too much */
                                 if(maxlen-idx < 200) {
                                     urltext = urltext.substring(0,idx+1);

src/org/openstreetmap/josm/tools/I18n.java

@@ -254 +254 @@
     private static final String gettext(String text, String ctx, boolean lazy)
     {
         int i;
-        if(ctx == null && text.startsWith("_:") && (i = text.indexOf("\n")) >= 0)
+        if(ctx == null && text.startsWith("_:") && (i = text.indexOf('\n')) >= 0)
         {
             ctx = text.substring(2,i-1);
             text = text.substring(i+1);
@@ -286 +286 @@
     private static final String gettextn(String text, String plural, String ctx, long num)
     {
         int i;
-        if(ctx == null && text.startsWith("_:") && (i = text.indexOf("\n")) >= 0)
+        if(ctx == null && text.startsWith("_:") && (i = text.indexOf('\n')) >= 0)
         {
             ctx = text.substring(2,i-1);
             text = text.substring(i+1);