Changeset 2846 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes

Timestamp:

2010-01-13T20:12:10+01:00 (14 years ago)

Author:

mjulius

Message:

fix messages for gui/conflict

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes

Files:

• NodeListMergeModel.java (modified) (3 diffs)
• NodeListTableCellRenderer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java

@@ -14 +14 @@
 import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
 import org.openstreetmap.josm.gui.conflict.pair.ListRole;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 public class NodeListMergeModel extends ListMergeModel<Node>{
@@ -29 +30 @@
      */
     public void populate(Way my, Way their) {
-        if (my == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "my"));
-        if (their == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "their"));
+        CheckParameterUtil.ensureParameterNotNull(my, "my");
+        CheckParameterUtil.ensureParameterNotNull(their, "their");
         getMergedEntries().clear();
         getMyEntries().clear();
@@ -63 +62 @@
      */
     public WayNodesConflictResolverCommand buildResolveCommand(Way my, Way their) {
-        if (my == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "my"));
-        if (their == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "their"));
+        CheckParameterUtil.ensureParameterNotNull(my, "my");
+        CheckParameterUtil.ensureParameterNotNull(their, "their");
         if (! isFrozen())
-            throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Can't build resolution command."));
+            throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Cannot build resolution command."));
         return new WayNodesConflictResolverCommand(my, their, getMergedEntries());
     }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java

@@ -6 +6 @@
 import java.awt.Color;
 import java.awt.Component;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -178 +179 @@
             default:
                 // should not happen
-                throw new RuntimeException(tr("Unexpected column index. Got {0}.", column));
+                throw new RuntimeException(MessageFormat.format("Unexpected column index. Got {0}.", column));
         }
         return this;