Changeset 2181 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

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

Author:

stoecker

Message:

lots of i18n fixes

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• conflict/ConflictCollection.java (modified) (2 diffs)
• osm/BackreferencedDataSet.java (modified) (1 diff)
• osm/DataSet.java (modified) (1 diff)
• osm/OsmPrimitive.java (modified) (3 diffs)
• osm/OsmPrimitiveType.java (modified) (2 diffs)
• osm/TagCollection.java (modified) (4 diffs)
• osm/Way.java (modified) (2 diffs)
• osm/history/History.java (modified) (5 diffs)
• osm/history/HistoryOsmPrimitive.java (modified) (2 diffs)
• osm/history/HistoryRelation.java (modified) (2 diffs)
• osm/history/HistoryWay.java (modified) (1 diff)
• osm/history/RelationMember.java (modified) (1 diff)
• osm/visitor/MergeSourceBuildingVisitor.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

@@ -76 +76 @@
     protected void addConflict(Conflict<?> conflict) throws IllegalStateException {
         if (hasConflictForMy(conflict.getMy()))
-            throw new IllegalStateException(tr("already registered a conflict for primitive ''{0}''", conflict.getMy().toString()));
+            throw new IllegalStateException(tr("Already registered a conflict for primitive ''{0}''.", conflict.getMy().toString()));
         if (!conflicts.contains(conflict)) {
             conflicts.add(conflict);
@@ -92 +92 @@
     public void add(Conflict<?> conflict) throws IllegalStateException, IllegalArgumentException {
         if (conflict == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "conflict"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "conflict"));
         addConflict(conflict);
         fireConflictAdded();

trunk/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java

@@ -103 +103 @@
     public BackreferencedDataSet(DataSet source) {
         if (source == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null."));
         this.source = source;
         int size = source.ways.size() + source.relations.size();

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -391 +391 @@
     public OsmPrimitive getPrimitiveById(long id, OsmPrimitiveType type) {
         if (id <= 0)
-            throw new IllegalArgumentException(tr("parameter {0} > 0 required. Got {1}.", "id", id));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' > 0 expected. Got ''{1}''.", "id", id));
         if (id <= 0)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "type"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "type"));
         Collection<? extends OsmPrimitive> primitives = null;
         switch(type) {

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -176 +176 @@
     public OsmPrimitive(long id) throws IllegalArgumentException {
         if (id < 0)
-            throw new IllegalArgumentException(tr("expected id >= 0. Got {0}", id));
+            throw new IllegalArgumentException(tr("Expected ID >= 0. Got {0}.", id));
         this.id = id;
         this.version = 0;
@@ -300 +300 @@
     public void setVisible(boolean visible) throws IllegalStateException{
         if (id == 0 && visible == false)
-            throw new IllegalStateException(tr("a primitive with id=0 can't be invisible"));
+            throw new IllegalStateException(tr("A primitive with ID = 0 can't be invisible."));
         this.visible = visible;
     }
@@ -336 +336 @@
     public void setOsmId(long id, int version) {
         if (id <= 0)
-            throw new IllegalArgumentException(tr("id > 0 expected. Got {0}", id));
+            throw new IllegalArgumentException(tr("ID > 0 expected. Got {0}.", id));
         if (version <= 0)
-            throw new IllegalArgumentException(tr("version > 0 expected. Got {0}", version));
+            throw new IllegalArgumentException(tr("Version > 0 expected. Got {0}.", version));
         this.id = id;
         this.version = version;

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java

@@ -23 +23 @@
             if (type.getAPIName().equals(typeName)) return type;
         }
-        throw new IllegalArgumentException(tr("parameter ''{0}'' is not a valid type name, got ''{1}''", "typeName", typeName));
+        throw new IllegalArgumentException(tr("Parameter ''{0}'' is not a valid type name. Got ''{1}''.", "typeName", typeName));
     }
 
@@ -34 +34 @@
         if (cls.equals(Way.class)) return WAY;
         if (cls.equals(Relation.class)) return RELATION;
-        throw new IllegalArgumentException(tr("parameter ''{0}'' is not an acceptable class, got ''{1}''", "cls", cls.toString()));
+        throw new IllegalArgumentException(tr("Parameter ''{0}'' is not an acceptable class. Got ''{1}''.", "cls", cls.toString()));
     }
 

trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java

@@ -570 +570 @@
         if (primitive == null) return;
         if (! isApplicableToPrimitive())
-            throw new IllegalStateException(tr("tag collection can't be applied to a primitive because there are keys with multiple values"));
+            throw new IllegalStateException(tr("Tag collection can't be applied to a primitive because there are keys with multiple values."));
         for (Tag tag: tags) {
             if (tag.getValue() == null || tag.getValue().equals("")) {
@@ -591 +591 @@
         if (primitives == null) return;
         if (! isApplicableToPrimitive())
-            throw new IllegalStateException(tr("tag collection can't be applied to a primitive because there are keys with multiple values"));
+            throw new IllegalStateException(tr("Tag collection can't be applied to a primitive because there are keys with multiple values."));
         for (OsmPrimitive primitive: primitives) {
             applyTo(primitive);
@@ -608 +608 @@
         if (primitive == null) return;
         if (! isApplicableToPrimitive())
-            throw new IllegalStateException(tr("tag collection can't be applied to a primitive because there are keys with multiple values"));
+            throw new IllegalStateException(tr("Tag collection can't be applied to a primitive because there are keys with multiple values."));
         primitive.removeAll();
         for (Tag tag: tags) {
@@ -626 +626 @@
         if (primitives == null) return;
         if (! isApplicableToPrimitive())
-            throw new IllegalStateException(tr("tag collection can't be applied to a primitive because there are keys with multiple values"));
+            throw new IllegalStateException(tr("Tag collection can't be applied to a primitive because there are keys with multiple values."));
         for (OsmPrimitive primitive: primitives) {
             replaceTagsOf(primitive);

trunk/src/org/openstreetmap/josm/data/osm/Way.java

@@ -210 +210 @@
         if (n==null) return;
         if (incomplete)
-            throw new IllegalStateException(tr("can't add node {0} to incomplete way {1}", n.getId(), getId()));
+            throw new IllegalStateException(tr("Cannot add node {0} to incomplete way {1}.", n.getId(), getId()));
         if (incomplete) return;
         clearCached();
@@ -228 +228 @@
         if (n==null) return;
         if (incomplete)
-            throw new IllegalStateException(tr("can't add node {0} to incomplete way {1}", n.getId(), getId()));
+            throw new IllegalStateException(tr("Cannot add node {0} to incomplete way {1}.", n.getId(), getId()));
         clearCached();
         nodes.add(offs, n);

trunk/src/org/openstreetmap/josm/data/osm/history/History.java

@@ -152 +152 @@
                 return primitive;
         }
-        throw new NoSuchElementException(tr("There's no primitive with version {0} in this history", version));
+        throw new NoSuchElementException(tr("There's no primitive with version {0} in this history.", version));
     }
 
@@ -159 +159 @@
 
         if (versions.isEmpty())
-            throw new NoSuchElementException(tr("There's no version valid at date ''{0}'' in this history", date));
+            throw new NoSuchElementException(tr("There's no version valid at date ''{0}'' in this history.", date));
         if (get(0).getTimestamp().compareTo(date)> 0)
-            throw new NoSuchElementException(tr("There's no version valid at date ''{0}'' in this history", date));
+            throw new NoSuchElementException(tr("There's no version valid at date ''{0}'' in this history.", date));
         for (int i = 1; i < versions.size();i++) {
             if (get(i-1).getTimestamp().compareTo(date) <= 0
@@ -172 +172 @@
     public HistoryOsmPrimitive get(int idx) {
         if (idx < 0 || idx >= versions.size())
-            throw new IndexOutOfBoundsException(tr("parameter ''{0}'' in range 0..{1} expected, got {2}", "idx", versions.size()-1, idx));
+            throw new IndexOutOfBoundsException(tr("Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''.", "idx", versions.size()-1, idx));
         return versions.get(idx);
     }
@@ -178 +178 @@
     public HistoryOsmPrimitive getEarliest() {
         if (isEmpty())
-            throw new NoSuchElementException(tr("no earliest version found. History is empty."));
+            throw new NoSuchElementException(tr("No earliest version found. History is empty."));
         return sortAscending().versions.get(0);
     }
@@ -184 +184 @@
     public HistoryOsmPrimitive getLatest() {
         if (isEmpty())
-            throw new NoSuchElementException(tr("no latest version found. History is empty."));
+            throw new NoSuchElementException(tr("No latest version found. History is empty."));
         return sortDescending().versions.get(0);
     }

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java

@@ -29 +29 @@
     protected void ensurePositiveLong(long value, String name) {
         if (value <= 0)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' > 0 expected, got ''{1}''", name, value));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' > 0 expected. Got ''{1}''.", name, value));
     }
 
     protected void ensureNotNull(Object obj, String name) {
         if (obj == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", name));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", name));
     }
 
@@ -102 +102 @@
     public int compareTo(HistoryOsmPrimitive o) {
         if (this.id != o.id)
-            throw new ClassCastException(tr("can't compare primitive with id ''{0}'' to primitive with id ''{1}''", o.id, this.id));
+            throw new ClassCastException(tr("Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''.", o.id, this.id));
         return new Long(this.version).compareTo(o.version);
     }

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java

@@ -87 +87 @@
     public RelationMember getRelationMember(int idx) throws IndexOutOfBoundsException  {
         if (idx < 0 || idx >= members.size())
-            throw new IndexOutOfBoundsException(tr("parameter {0} not in range 0..{1}, got {2}", "idx", members.size(),idx));
+            throw new IndexOutOfBoundsException(tr("Parameter {0} not in range 0..{1}. Got ''{2}''.", "idx", members.size(),idx));
         return members.get(idx);
     }
@@ -108 +108 @@
     public void addMember(RelationMember member) throws IllegalArgumentException {
         if (member == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "member"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "member"));
         members.add(member);
     }

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java

@@ -46 +46 @@
     public long getNodeId(int idx) throws IndexOutOfBoundsException {
         if (idx < 0 || idx >= nodeIds.size())
-            throw new IndexOutOfBoundsException(tr("parameter {0} not in range 0..{1}, got {2}", "idx", nodeIds.size(),idx));
+            throw new IndexOutOfBoundsException(tr("Parameter {0} not in range 0..{1}. Got ''{2}''.", "idx", nodeIds.size(),idx));
         return nodeIds.get(idx);
     }

trunk/src/org/openstreetmap/josm/data/osm/history/RelationMember.java

@@ -29 +29 @@
         this.role = (role == null ? "" : role);
         if (primitiveType == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "primitiveType"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "primitiveType"));
         this.primitiveType = primitiveType;
         if (primitiveId <=0)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' > 0 expected, got ''{1}''", "primitiveId", primitiveId));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' > 0 expected. Got ''{1}''.", "primitiveId", primitiveId));
         this.primitiveId = primitiveId;
     }

trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java

@@ -42 +42 @@
     public MergeSourceBuildingVisitor(DataSet selectionBase) throws IllegalArgumentException {
         if (selectionBase == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "selectionBase"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "selectionBase"));
         this.selectionBase = selectionBase;
         this.hull = new DataSet();