Changeset 34656 in osm for applications/editors

Timestamp:

2018-09-15T14:21:41+02:00 (6 years ago)

Author:

donvip

Message:

fix UnnecessaryParentheses warnings

Location:

applications/editors/josm/plugins/CommandLine/src/org/openstreetmap/josm/plugins/commandline

Files:

• Command.java (modified) (1 diff)
• CommandLine.java (modified) (3 diffs)
• Loader.java (modified) (1 diff)
• OsmToCmd.java (modified) (1 diff)
• Relay.java (modified) (1 diff)

applications/editors/josm/plugins/CommandLine/src/org/openstreetmap/josm/plugins/commandline/Command.java

@@ -140 +140 @@
             if (obj instanceof String) {
                 if (parameter.getRawValue() instanceof Relay) {
-                    if (((Relay) (parameter.getRawValue())).isCorrectValue((String) obj))
+                    if (((Relay) parameter.getRawValue()).isCorrectValue((String) obj))
                         return true;
                 }

applications/editors/josm/plugins/CommandLine/src/org/openstreetmap/josm/plugins/commandline/CommandLine.java

@@ -148 +148 @@
 
     private void loadCommands() {
-        commands = (new Loader(getPluginDirs().getUserDataDirectory(false))).load();
+        commands = new Loader(getPluginDirs().getUserDataDirectory(false)).load();
         if (commands.isEmpty()) {
             if (!GraphicsEnvironment.isHeadless() && JOptionPane.YES_OPTION == JOptionPane.showConfirmDialog(MainApplication.getMainFrame(),
@@ -155 +155 @@
                 try {
                     downloadAndInstallDefaultCommands();
-                    commands = (new Loader(getPluginDirs().getUserDataDirectory(false))).load();
+                    commands = new Loader(getPluginDirs().getUserDataDirectory(false)).load();
                     JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr("Default commands have been successfully installed"),
                             tr("Success"), JOptionPane.INFORMATION_MESSAGE);
@@ -232 +232 @@
             prefix = tr(currentParameter.description == null ? currentParameter.name : currentParameter.description);
             if (currentParameter.getRawValue() instanceof Relay)
-                prefix = prefix + " (" + ((Relay) (currentParameter.getRawValue())).getOptionsString() + ")";
+                prefix = prefix + " (" + ((Relay) currentParameter.getRawValue()).getOptionsString() + ")";
             prefix += commandSymbol;
             String value = currentParameter.getValue();

applications/editors/josm/plugins/CommandLine/src/org/openstreetmap/josm/plugins/commandline/Loader.java

@@ -117 +117 @@
     @Override
     public void characters(char[] ch, int start, int length) {
-        String text = (new String(ch, start, length)).trim();
+        String text = new String(ch, start, length).trim();
         if (currentParameter != null) {
             if (currentTag.equals("name")) {

applications/editors/josm/plugins/CommandLine/src/org/openstreetmap/josm/plugins/commandline/OsmToCmd.java

@@ -111 +111 @@
                         return;
                     }
-                    if (!(v.equals("0.6"))) {
+                    if (!v.equals("0.6")) {
                         throwException(tr("Unsupported version: {0}", v));
                         return;

applications/editors/josm/plugins/CommandLine/src/org/openstreetmap/josm/plugins/commandline/Relay.java

@@ -25 +25 @@
     public void addValue(String value) {
         String letter = null;
-        if (!(options.containsValue(value))) {
+        if (!options.containsValue(value)) {
             int i = 0;
             for (; i < value.length(); i++) {