Changeset 8390 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2015-05-18T02:14:30+02:00 (10 years ago)

Author:

Don-vip

Message:

Sonar - various performance improvements

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CombineWayAction.java (modified) (1 diff)
• CopyAction.java (modified) (1 diff)
• CopyCoordinatesAction.java (modified) (1 diff)
• OpenFileAction.java (modified) (2 diffs)
• RestartAction.java (modified) (1 diff)
• ShowStatusReportAction.java (modified) (9 diffs)
• ToggleAction.java (modified) (2 diffs)
• mapmode/DrawAction.java (modified) (2 diffs)
• mapmode/ExtrudeAction.java (modified) (2 diffs)
• search/PushbackTokenizer.java (modified) (2 diffs)
• upload/CyclicUploadDependencyException.java (modified) (2 diffs)
• upload/UploadNotesTask.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -326 +326 @@
         public String toString() {
             return new StringBuilder()
-            .append("[")
+            .append('[')
             .append(a.getId())
-            .append(",")
+            .append(',')
             .append(b.getId())
-            .append("]")
+            .append(']')
             .toString();
         }

trunk/src/org/openstreetmap/josm/actions/CopyAction.java

@@ -67 +67 @@
         StringBuilder idsBuilder = new StringBuilder();
         for (OsmPrimitive p : primitives) {
-            idsBuilder.append(OsmPrimitiveType.from(p).getAPIName()).append(" ");
-            idsBuilder.append(p.getId()).append(",");
+            idsBuilder.append(OsmPrimitiveType.from(p).getAPIName()).append(' ').append(p.getId()).append(',');
         }
         return idsBuilder.substring(0, idsBuilder.length() - 1);

trunk/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java

@@ -32 +32 @@
             s.append(", ");
             s.append(n.getCoor().lon());
-            s.append("\n");
+            s.append('\n');
         }
         Utils.copyToClipboard(s.toString().trim());

trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java

@@ -165 +165 @@
                             importer.filter.getDescription()
                     )
-            ).append("<br>").append("<ul>");
+            ).append("<br><ul>");
             for (File f: files) {
                 msg.append("<li>").append(f.getAbsolutePath()).append("</li>");
@@ -189 +189 @@
                             files.size()
                     )
-            ).append("<br>").append("<ul>");
+            ).append("<br><ul>");
             for (File f: files) {
                 msg.append("<li>").append(f.getAbsolutePath()).append(" (<i>")

trunk/src/org/openstreetmap/josm/actions/RestartAction.java

@@ -116 +116 @@
                 StringBuilder sb = new StringBuilder(mainCommand[0]);
                 for (int i = 1; i < mainCommand.length && !mainCommand[i-1].endsWith(".jar"); i++) {
-                    sb.append(" ").append(mainCommand[i]);
+                    sb.append(' ').append(mainCommand[i]);
                 }
                 String jarPath = sb.toString();

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -70 +70 @@
         StringBuilder text = new StringBuilder();
         text.append(Version.getInstance().getReleaseAttributes())
-            .append("\n")
-            .append("Identification: ").append(Version.getInstance().getAgentString())
-            .append("\n")
-            .append("Memory Usage: ")
+            .append("\nIdentification: ").append(Version.getInstance().getAgentString())
+            .append("\nMemory Usage: ")
             .append(Runtime.getRuntime().totalMemory()/1024/1024)
             .append(" MB / ")
@@ -79 +77 @@
             .append(" MB (")
             .append(Runtime.getRuntime().freeMemory()/1024/1024)
-            .append(" MB allocated, but free)")
-            .append("\n")
-            .append("Java version: ").append(System.getProperty("java.version")).append(", ")
-            .append(System.getProperty("java.vendor")).append(", ").append(System.getProperty("java.vm.name"))
-            .append("\n");
+            .append(" MB allocated, but free)\nJava version: ")
+            .append(System.getProperty("java.version")).append(", ")
+            .append(System.getProperty("java.vendor")).append(", ")
+            .append(System.getProperty("java.vm.name")).append('\n');
         if (Main.platform.getClass() == PlatformHookUnixoid.class) {
             // Add Java package details
@@ -90 +87 @@
                 text.append("Java package: ")
                     .append(packageDetails)
-                    .append("\n");
+                    .append('\n');
             }
             // Add WebStart package details if run from JNLP
@@ -98 +95 @@
                     text.append("WebStart package: ")
                         .append(webStartDetails)
-                        .append("\n");
+                        .append('\n');
                 }
             }
@@ -127 +124 @@
             }
             if (!vmArguments.isEmpty()) {
-                text.append("VM arguments: "+ vmArguments.toString().replace("\\\\", "\\"));
-                text.append("\n");
+                text.append("VM arguments: ").append(vmArguments.toString().replace("\\\\", "\\")).append('\n');
             }
         } catch (SecurityException e) {
@@ -135 +131 @@
         List<String> commandLineArgs = Main.getCommandLineArgs();
         if (!commandLineArgs.isEmpty()) {
-            text.append("Program arguments: "+ Arrays.toString(commandLineArgs.toArray()));
-            text.append("\n");
+            text.append("Program arguments: ").append(Arrays.toString(commandLineArgs.toArray())).append('\n');
         }
         if (Main.main != null) {
@@ -145 +140 @@
                     text.append("Dataset consistency test: No problems found\n");
                 } else {
-                    text.append("\nDataset consistency test:\n"+result+"\n");
-                }
-            }
-        }
-        text.append("\n")
-            .append(PluginHandler.getBugReportText())
-            .append("\n");
+                    text.append("\nDataset consistency test:\n").append(result).append('\n');
+                }
+            }
+        }
+        text.append('\n').append(PluginHandler.getBugReportText()).append('\n');
 
         Collection<String> errorsWarnings = Main.getLastErrorAndWarnings();
@@ -157 +150 @@
             text.append("Last errors/warnings:\n");
             for (String s : errorsWarnings) {
-                text.append("- ").append(s).append("\n");
-            }
-            text.append("\n");
+                text.append("- ").append(s).append('\n');
+            }
+            text.append('\n');
         }
 
@@ -180 +173 @@
             }
             for (Entry<String, Setting<?>> entry : settings.entrySet()) {
-                text.append(entry.getKey()).append("=").append(entry.getValue().getValue()).append("\n");
+                text.append(entry.getKey()).append('=').append(entry.getValue().getValue()).append('\n');
             }
         } catch (Exception x) {

trunk/src/org/openstreetmap/josm/actions/ToggleAction.java

@@ -3 +3 @@
 
 import java.awt.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.swing.ButtonModel;
@@ -23 +23 @@
 public abstract class ToggleAction extends JosmAction {
 
-    private final transient List<ButtonModel> buttonModels = new ArrayList<>();
+    private final transient Set<ButtonModel> buttonModels = new HashSet<>();
 
     /**

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -1192 +1192 @@
         if (getCurrentBaseNode() != null && !wayIsFinished) {
             if (alt) {
-                rv.append(" ").append(tr("Start new way from last node."));
+                rv.append(' ').append(tr("Start new way from last node."));
             } else {
-                rv.append(" ").append(tr("Continue way from last node."));
+                rv.append(' ').append(tr("Continue way from last node."));
             }
             if (snapHelper.isSnapOn()) {
-                rv.append(" ").append(tr("Angle snapping active."));
+                rv.append(' ').append(tr("Angle snapping active."));
             }
         }
@@ -1220 +1220 @@
             for (Node m : w.getNodes()) {
                 if (m.equals(mouseOnExistingNode) || mouseOnExistingWays.contains(w)) {
-                    rv.append(" ").append(tr("Finish drawing."));
+                    rv.append(' ').append(tr("Finish drawing."));
                     break;
                 }

trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

@@ -252 +252 @@
                 "Alt-drag to create a new rectangle, double click to add a new node."));
             if (dualAlignEnabled) {
-                rv.append(" ").append(tr("Dual alignment active."));
+                rv.append(' ').append(tr("Dual alignment active."));
                 if (dualAlignSegmentCollapsed)
-                    rv.append(" ").append(tr("Segment collapsed due to its direction reversing."));
+                    rv.append(' ').append(tr("Segment collapsed due to its direction reversing."));
             }
         } else {
@@ -270 +270 @@
             }
             if (dualAlignActive) {
-                rv.append(" ").append(tr("Dual alignment active."));
+                rv.append(' ').append(tr("Dual alignment active."));
                 if (dualAlignSegmentCollapsed) {
-                    rv.append(" ").append(tr("Segment collapsed due to its direction reversing."));
+                    rv.append(' ').append(tr("Segment collapsed due to its direction reversing."));
                 }
             }

trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java

@@ -177 +177 @@
             // try parsing number
             try {
-                currentNumber = Long.parseLong(currentText);
+                currentNumber = Long.valueOf(currentText);
             } catch (NumberFormatException e) {
                 currentNumber = null;
@@ -186 +186 @@
             if (isRange) {
                 try {
-                    currentNumber = Long.parseLong(currentText.substring(0, pos));
+                    currentNumber = Long.valueOf(currentText.substring(0, pos));
                 } catch (NumberFormatException e) {
                     currentNumber = null;
                 }
                 try {
-                    currentRange = Long.parseLong(currentText.substring(pos + 1));
+                    currentRange = Long.valueOf(currentText.substring(pos + 1));
                 } catch (NumberFormatException e) {
                     currentRange = null;

trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java

@@ -20 +20 @@
         StringBuilder sb = new StringBuilder();
         if (r.getName() != null) {
-            sb.append("'").append(r.getName()).append("'");
+            sb.append('\'').append(r.getName()).append('\'');
         } else if (!r.isNew()) {
             sb.append(r.getId());
@@ -33 +33 @@
         StringBuilder sb = new StringBuilder();
         sb.append(tr("Cyclic dependency between relations:"))
-          .append("[");
+          .append('[');
         for (int i=0; i< cycle.size(); i++) {
             if (i >0 ) {
-                sb.append(",");
+                sb.append(',');
             }
             sb.append(formatRelation(cycle.get(i)));
         }
-        sb.append("]");
+        sb.append(']');
         return sb.toString();
     }

trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java

@@ -133 +133 @@
                 for (Map.Entry<Note, Exception> entry : failedNotes.entrySet()) {
                     sb.append(tr("Note {0} failed: {1}", entry.getKey().getId(), entry.getValue().getMessage()));
-                    sb.append("\n");
+                    sb.append('\n');
                 }
                 Main.error("Notes failed to upload: " + sb.toString());