Changeset 2990 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2010-02-15T09:03:57+01:00 (13 years ago)

Author:

jttt

Message:

Fix some eclipse warnings

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• ChangePropertyCommand.java (modified) (2 diffs)
• MoveCommand.java (modified) (1 diff)
• TagConflictResolveCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.util.Collection;
@@ -100 +99 @@
             if (value == null) {
                 switch(OsmPrimitiveType.from(primitive)) {
-                    case NODE: msg = marktr("Remove \"{0}\" for node ''{1}''"); break;
-                    case WAY: msg = marktr("Remove \"{0}\" for way ''{1}''"); break;
-                    case RELATION: msg = marktr("Remove \"{0}\" for relation ''{1}''"); break;
+                case NODE: msg = marktr("Remove \"{0}\" for node ''{1}''"); break;
+                case WAY: msg = marktr("Remove \"{0}\" for way ''{1}''"); break;
+                case RELATION: msg = marktr("Remove \"{0}\" for relation ''{1}''"); break;
                 }
                 text = tr(msg, key, primitive.getDisplayName(DefaultNameFormatter.getInstance()));
             } else {
                 switch(OsmPrimitiveType.from(primitive)) {
-                    case NODE: msg = marktr("Set {0}={1} for node ''{2}''"); break;
-                    case WAY: msg = marktr("Set {0}={1} for way ''{2}''"); break;
-                    case RELATION: msg = marktr("Set {0}={1} for relation ''{2}''"); break;
+                case NODE: msg = marktr("Set {0}={1} for node ''{2}''"); break;
+                case WAY: msg = marktr("Set {0}={1} for way ''{2}''"); break;
+                case RELATION: msg = marktr("Set {0}={1} for relation ''{2}''"); break;
                 }
                 text = tr(msg, key, value, primitive.getDisplayName(DefaultNameFormatter.getInstance()));

trunk/src/org/openstreetmap/josm/command/MoveCommand.java

@@ -2 +2 @@
 package org.openstreetmap.josm.command;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
 

trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java

@@ -25 +25 @@
  */
 public class TagConflictResolveCommand extends ConflictResolveCommand {
+    @SuppressWarnings("unused")
     private static final Logger logger = Logger.getLogger(TagConflictResolveCommand.class.getName());
 
@@ -64 +65 @@
         String msg = "";
         switch(OsmPrimitiveType.from(conflict.getMy())) {
-            case NODE: msg = marktr("Resolve {0} tag conflicts in node {1}"); break;
-            case WAY: msg = marktr("Resolve {0} tag conflicts in way {1}"); break;
-            case RELATION: msg = marktr("Resolve {0} tag conflicts in relation {1}"); break;
+        case NODE: msg = marktr("Resolve {0} tag conflicts in node {1}"); break;
+        case WAY: msg = marktr("Resolve {0} tag conflicts in way {1}"); break;
+        case RELATION: msg = marktr("Resolve {0} tag conflicts in relation {1}"); break;
         }
         return new DefaultMutableTreeNode(