Changeset 2846 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

Timestamp:

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

Author:

mjulius

Message:

fix messages for gui/conflict

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

@@ -12 +12 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -320 +321 @@
         ArrayList<T> mergedEntries = getMergedEntries();
         if (current < 0 || current >= mergedEntries.size())
-            throw new IllegalArgumentException(tr("Parameter current out of range. Got {0}.", current));
+            throw new IllegalArgumentException(MessageFormat.format("Parameter current out of range. Got {0}.", current));
         for (int i=rows.length -1; i>=0; i--) {
             int row = rows[i];
@@ -372 +373 @@
 
         if (current < 0 || current >= mergedEntries.size())
-            throw new IllegalArgumentException(tr("Parameter current out of range. Got {0}.", current));
+            throw new IllegalArgumentException(MessageFormat.format("Parameter current out of range. Got {0}.", current));
         if (current == mergedEntries.size() -1) {
             copyToEnd(source, rows);