Changeset 2181 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

2009-09-22T15:34:19+02:00 (15 years ago)

Author:

stoecker

Message:

lots of i18n fixes

Location:

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

Files:

• pair/ComparePairType.java (modified) (1 diff)
• pair/ListMergeModel.java (modified) (6 diffs)
• pair/ListMerger.java (modified) (15 diffs)
• pair/nodes/NodeListMergeModel.java (modified) (2 diffs)
• pair/nodes/NodeListTableCellRenderer.java (modified) (1 diff)
• pair/properties/PropertiesMergeModel.java (modified) (2 diffs)
• pair/relation/RelationMemberListMergeModel.java (modified) (2 diffs)
• pair/tags/TagMergeItem.java (modified) (4 diffs)
• pair/tags/TagMergeTableCellRenderer.java (modified) (1 diff)
• tags/MultiValueResolutionDecision.java (modified) (6 diffs)
• tags/RelationMemberConflictDecision.java (modified) (1 diff)
• tags/TagConflictResolverModel.java (modified) (1 diff)

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

@@ -80 +80 @@
     public ListRole getOppositeRole(ListRole role) {
         if (!isParticipatingIn(role))
-            throw new IllegalStateException(tr("role {0} is not participating in compare pair {1}", role.toString(), this.toString()));
+            throw new IllegalStateException(tr("Role {0} is not participating in compare pair {1}.", role.toString(), this.toString()));
         if (participatingRoles[0].equals(role))
             return participatingRoles[1];

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

@@ -323 +323 @@
         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(tr("Parameter current out of range. Got {0}.", current));
         for (int i=rows.length -1; i>=0; i--) {
             int row = rows[i];
@@ -375 +375 @@
 
         if (current < 0 || current >= mergedEntries.size())
-            throw new IllegalArgumentException(tr("parameter current out of range: got {0}", current));
+            throw new IllegalArgumentException(tr("Parameter current out of range. Got {0}.", current));
         if (current == mergedEntries.size() -1) {
             copyToEnd(source, rows);
@@ -589 +589 @@
         public boolean isSamePositionInOppositeList(int row) {
             if (!isParticipatingInCurrentComparePair())
-                throw new IllegalStateException(tr("list in role {0} is currently not participating in a compare pair", role.toString()));
+                throw new IllegalStateException(tr("List in role {0} is currently not participating in a compare pair.", role.toString()));
             if (row >= getEntries().size()) return false;
             if (row >= getOppositeEntries().size()) return false;
@@ -613 +613 @@
         public boolean isIncludedInOppositeList(int row) {
             if (!isParticipatingInCurrentComparePair())
-                throw new IllegalStateException(tr("list in role {0} is currently not participating in a compare pair", role.toString()));
+                throw new IllegalStateException(tr("List in role {0} is currently not participating in a compare pair.", role.toString()));
 
             if (row >= getEntries().size()) return false;
@@ -762 +762 @@
             if (index < compareModes.size())
                 return compareModes.get(index);
-            throw new IllegalArgumentException(tr("unexpected value of parameter \"index\". Got {0}", index));
+            throw new IllegalArgumentException(tr("Unexpected value of parameter ''index''. Got {0}.", index));
         }
 
@@ -776 +776 @@
             int i = compareModes.indexOf(anItem);
             if (i < 0)
-                throw new IllegalStateException(tr("item {0} not found in list", anItem));
+                throw new IllegalStateException(tr("Item {0} not found in list.", anItem));
             selectedIdx = i;
             fireModelDataChanged();

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

@@ -436 +436 @@
                 putValue(Action.NAME, tr("> bottom"));
             }
-            putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements to the end of the list of merged elements"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements to the end of the list of merged elements."));
             setEnabled(false);
         }
@@ -463 +463 @@
                 putValue(Action.NAME, "> before");
             }
-            putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements before the first selected element in the list of merged elements"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements before the first selected element in the list of merged elements."));
             setEnabled(false);
         }
@@ -497 +497 @@
                 putValue(Action.NAME, "> after");
             }
-            putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements after the first selected element in the list of merged elements"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements after the first selected element in the list of merged elements."));
             setEnabled(false);
         }
@@ -527 +527 @@
                 putValue(Action.NAME, "< top");
             }
-            putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected element to the start of the list of merged elements"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected element to the start of the list of merged elements."));
             setEnabled(false);
         }
@@ -550 +550 @@
                 putValue(Action.NAME, "< bottom");
             }
-            putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected elements to the end of the list of merged elements"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected elements to the end of the list of merged elements."));
             setEnabled(false);
         }
@@ -572 +572 @@
                 putValue(Action.NAME, "< before");
             }
-            putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected elements before the first selected element in the list of merged elements"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected elements before the first selected element in the list of merged elements."));
             setEnabled(false);
         }
@@ -632 +632 @@
                 putValue(Action.NAME, tr("Up"));
             }
-            putValue(Action.SHORT_DESCRIPTION, tr("Move up the selected elements by one position"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Move up the selected elements by one position."));
             setEnabled(false);
         }
@@ -664 +664 @@
                 putValue(Action.NAME, tr("Down"));
             }
-            putValue(Action.SHORT_DESCRIPTION, tr("Move down the selected entries by one position"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Move down the selected entries by one position."));
             setEnabled(false);
         }
@@ -696 +696 @@
                 putValue(Action.NAME, tr("Remove"));
             }
-            putValue(Action.SHORT_DESCRIPTION, tr("Remove the selected entries from the list of merged elements"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Remove the selected entries from the list of merged elements."));
             setEnabled(false);
         }
@@ -726 +726 @@
         public FreezeAction() {
             putValue(Action.NAME, tr("Freeze"));
-            putValue(Action.SHORT_DESCRIPTION, tr("Freeze the current list of merged elements"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Freeze the current list of merged elements."));
             putValue(PROP_SELECTED, false);
             setEnabled(true);
@@ -759 +759 @@
             if (state == ItemEvent.SELECTED) {
                 putValue(Action.NAME, tr("Unfreeze"));
-                putValue(Action.SHORT_DESCRIPTION, tr("Unfreeze the list of merged elements and start merging"));
+                putValue(Action.SHORT_DESCRIPTION, tr("Unfreeze the list of merged elements and start merging."));
                 model.setFrozen(true);
             } else if (state == ItemEvent.DESELECTED) {
                 putValue(Action.NAME, tr("Freeze"));
-                putValue(Action.SHORT_DESCRIPTION, tr("Freeze the current list of merged elements"));
+                putValue(Action.SHORT_DESCRIPTION, tr("Freeze the current list of merged elements."));
                 model.setFrozen(false);
             }
@@ -786 +786 @@
         if (newValue) {
             lblFrozenState.setText(
-                    tr("<html>Click <strong>{0}</strong> to start merging my and their entries</html>",
+                    tr("<html>Click <strong>{0}</strong> to start merging my and their entries.</html>",
                             freezeAction.getValue(Action.NAME))
             );
         } else {
             lblFrozenState.setText(
-                    tr("<html>Click <strong>{0}</strong> to finish merging my and their entries</html>",
+                    tr("<html>Click <strong>{0}</strong> to finish merging my and their entries.</html>",
                             freezeAction.getValue(Action.NAME))
             );
@@ -879 +879 @@
         protected void setParticipatingInSynchronizedScrolling(Adjustable adjustable, boolean isParticipating) {
             if (adjustable == null)
-                throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "adjustable"));
+                throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "adjustable"));
 
             if (! synchronizedAdjustables.contains(adjustable))
-                throw new IllegalStateException(tr("adjustable {0} not registered yet. Can't set participation in synchronized adjustment",adjustable));
+                throw new IllegalStateException(tr("Adjustable {0} not registered yet. Can't set participation in synchronized adjustment.", adjustable));
 
             enabledMap.put(adjustable, isParticipating);
@@ -897 +897 @@
         protected boolean isParticipatingInSynchronizedScrolling(Adjustable adjustable) throws IllegalStateException {
             if (! synchronizedAdjustables.contains(adjustable))
-                throw new IllegalStateException(tr("adjustable {0} not registered yet",adjustable));
+                throw new IllegalStateException(tr("Adjustable {0} not registered yet.", adjustable));
 
             return enabledMap.get(adjustable);
@@ -920 +920 @@
         protected void adapt(final JCheckBox view, final Adjustable adjustable) throws IllegalArgumentException, IllegalStateException {
             if (adjustable == null)
-                throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "adjustable"));
+                throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "adjustable"));
             if (view == null)
-                throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "view"));
+                throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "view"));
 
             if (! synchronizedAdjustables.contains(adjustable)) {

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

@@ -31 +31 @@
     public void populate(Way my, Way their) {
         if (my == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my"));
+            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"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "their"));
         getMergedEntries().clear();
         getMyEntries().clear();
@@ -65 +65 @@
     public WayNodesConflictResolverCommand buildResolveCommand(Way my, Way their) {
         if (my == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my"));
+            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"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "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. Can't build resolution command."));
         return new WayNodesConflictResolverCommand(my, their, getMergedEntries());
     }

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

@@ -180 +180 @@
             default:
                 // should not happen
-                throw new RuntimeException(tr("unexpected column index. Got {0}", column));
+                throw new RuntimeException(tr("Unexpected column index. Got {0}.", column));
         }
         return this;

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java

@@ -295 +295 @@
     public void decideDeletedStateConflict(MergeDecisionType decision) throws IllegalArgumentException{
         if (decision == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "decision"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "decision"));
         this.deletedMergeDecision = decision;
         setChanged();
@@ -310 +310 @@
     public void decideVisibleStateConflict(MergeDecisionType decision) throws IllegalArgumentException {
         if (decision == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "decision"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "decision"));
         this.visibleMergeDecision = decision;
         setChanged();

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java

@@ -71 +71 @@
     public void populate(Relation my, Relation their) {
         if (my == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my"));
+            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"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "their"));
 
         getMergedEntries().clear();
@@ -114 +114 @@
     public RelationMemberConflictResolverCommand buildResolveCommand(Relation my, Relation their) {
         if (my == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my"));
+            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"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "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. Can't build resolution command"));
         return new RelationMemberConflictResolverCommand(my, their, getMergedEntries());
     }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java

@@ -31 +31 @@
     public TagMergeItem(String key, String myTagValue, String theirTagValue) {
         if (key == null) {
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "key"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "key"));
         }
         this.key  = key;
@@ -50 +50 @@
      */
     public TagMergeItem(String key, OsmPrimitive my, OsmPrimitive their) {
-        if (key == null) throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "key"));
-        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"));
+        if (key == null) throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "key"));
+        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"));
         this.key = key;
         myTagValue = my.get(key);
@@ -66 +66 @@
      */
     public void decide(MergeDecisionType decision) throws IllegalArgumentException {
-        if (decision == null) throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "decision"));
+        if (decision == null) throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "decision"));
         this.mergeDecision = decision;
     }
@@ -96 +96 @@
      */
     public void applyToMyPrimitive(OsmPrimitive primitive) throws IllegalArgumentException, IllegalStateException {
-        if (primitive == null) throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "primitive"));
+        if (primitive == null) throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "primitive"));
         if (mergeDecision == MergeDecisionType.UNDECIDED) {
-            throw new IllegalStateException(tr("cannot apply undecided tag merge item"));
+            throw new IllegalStateException(tr("Cannot apply undecided tag merge item."));
         } else if (mergeDecision == MergeDecisionType.KEEP_THEIR) {
             if (theirTagValue == null) {

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java

@@ -37 +37 @@
         default:
             // should not happen, but just in case 
-            throw new IllegalArgumentException(tr("Parameter 'col' must be 0 or 1. Got {0}", col));
+            throw new IllegalArgumentException(tr("Parameter 'col' must be 0 or 1. Got {0}.", col));
         }
         return this;

trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java

@@ -49 +49 @@
     public MultiValueResolutionDecision(TagCollection tags) throws IllegalArgumentException {
         if (tags == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "tags"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "tags"));
         if (tags.isEmpty())
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be empty", "tags"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be empty.", "tags"));
         if (tags.getKeys().size() != 1)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' with tags for exactly one key expected. Got {1}", "tags", tags.getKeys().size()));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' with tags for exactly one key expected. Got {1}.", "tags", tags.getKeys().size()));
         this.tags = tags;
         autoDecide();
@@ -97 +97 @@
     public void keepOne(String value) throws IllegalArgumentException, IllegalStateException {
         if (value == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "value"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "value"));
         if (!tags.getValues().contains(value))
-            throw new IllegalStateException(tr("tag collection doesn't include the selected value ''{0}''", value));
+            throw new IllegalStateException(tr("Tag collection doesn't include the selected value ''{0}''.", value));
         this.value = value;
         this.type = MultiValueDecisionType.KEEP_ONE;
@@ -134 +134 @@
     public String getChosenValue() throws IllegalStateException {
         switch(type) {
-            case UNDECIDED: throw new IllegalStateException(tr("Not decided yet"));
+            case UNDECIDED: throw new IllegalStateException(tr("Not decided yet."));
             case KEEP_ONE: return value;
             case KEEP_NONE: return null;
@@ -211 +211 @@
         if (primitive == null) return;
         if (!isDecided())
-            throw new IllegalStateException(tr("Not decided yet"));
+            throw new IllegalStateException(tr("Not decided yet."));
         String key = tags.getKeys().iterator().next();
         String value = getChosenValue();
@@ -247 +247 @@
     public Command buildChangeCommand(OsmPrimitive primitive) throws IllegalArgumentException, IllegalStateException {
         if (primitive == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "primitive"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "primitive"));
         if (!isDecided())
-            throw new IllegalStateException(tr("Not decided yet"));
+            throw new IllegalStateException(tr("Not decided yet."));
         String key = tags.getKeys().iterator().next();
         String value = getChosenValue();
@@ -266 +266 @@
     public Command buildChangeCommand(Collection<? extends OsmPrimitive> primitives) {
         if (primitives == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "primitives"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "primitives"));
         if (!isDecided())
-            throw new IllegalStateException(tr("Not decided yet"));
+            throw new IllegalStateException(tr("Not decided yet."));
         String key = tags.getKeys().iterator().next();
         String value = getChosenValue();

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java

@@ -19 +19 @@
     public RelationMemberConflictDecision(Relation relation, int pos) throws IllegalArgumentException {
         if (relation == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "relation"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "relation"));
         RelationMember member = relation.getMember(pos);
         if (member == null)
-            throw new IndexOutOfBoundsException(tr("pos {0} is out of range. current number of members: {1}", pos, relation.getMembersCount()));
+            throw new IndexOutOfBoundsException(tr("Position {0} is out of range. Current number of members is {1}.", pos, relation.getMembersCount()));
         this.relation = relation;
         this.pos  = pos;

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java

@@ -84 +84 @@
     public void populate(TagCollection tags) {
         if (tags == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "tags"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "tags"));
         this.tags = tags;
         keys = new ArrayList<String>();