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

Timestamp:

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

Author:

stoecker

Message:

lots of i18n fixes

Location:

trunk/src/org/openstreetmap/josm/data/osm/history

Files:

• History.java (modified) (5 diffs)
• HistoryOsmPrimitive.java (modified) (2 diffs)
• HistoryRelation.java (modified) (2 diffs)
• HistoryWay.java (modified) (1 diff)
• RelationMember.java (modified) (1 diff)

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;
     }