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

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/pair/tags

Files:

• TagMergeItem.java (modified) (4 diffs)
• TagMergeTableCellRenderer.java (modified) (1 diff)

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;