Changeset 2141 in josm for trunk/src/org

Timestamp:

2009-09-15T16:32:01+02:00 (15 years ago)

Author:

Gubaer

Message:

applied #3513: patch by Claudius Henrichs : Typos and unifying tooltips
fixed a compilation error from r2138

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DataSet.java (modified) (1 diff)
• gui/ExtendedDialog.java (modified) (1 diff)
• gui/conflict/tags/MultiValueResolutionDecision.java (modified) (1 diff)
• gui/io/SaveLayerInfoCellRenderer.java (modified) (2 diffs)

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

@@ -392 +392 @@
             throw new IllegalArgumentException(tr("parameter {0} > 0 required. Got {1}.", "id", id));
         if (id <= 0)
-            throw new IllegalArgumentException(tr("paramete''{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/gui/ExtendedDialog.java

@@ -295 +295 @@
 
         // Ensure all required variables are available
-        if(!rememberSizePref.isEmpty() && defaultWindowGeometry != null) {
+        if(rememberSizePref.length() == 0 && defaultWindowGeometry != null) {
             if(visible) {
                 new WindowGeometry(rememberSizePref,

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

@@ -134 +134 @@
     public String getChosenValue() throws IllegalStateException {
         switch(type) {
-            case UNDECIDED: throw new IllegalStateException(tr("not yet decided"));
+            case UNDECIDED: throw new IllegalStateException(tr("Not decided yet"));
             case KEEP_ONE: return value;
             case KEEP_NONE: return null;

trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java

@@ -48 +48 @@
             lblRenderer.setToolTipText(tr("Layer ''{0}'' has modifications which should be uploaded to the server.", info.getName()));
         } else {
-            lblRenderer.setToolTipText(tr("Layer ''{0}'' has no modifications to be uploaded", info.getName()));
+            lblRenderer.setToolTipText(tr("Layer ''{0}'' has no modifications to be uploaded.", info.getName()));
         }
         return lblRenderer;
@@ -59 +59 @@
         lblRenderer.setText(text);
         if (info.getLayer().requiresSaveToFile()) {
-            lblRenderer.setToolTipText(tr("Layer ''{0}'' has modifications which should be saved to its assoicated file ''{1}''.", info.getName(), info.getFile().toString()));
+            lblRenderer.setToolTipText(tr("Layer ''{0}'' has modifications which should be saved to its associated file ''{1}''.", info.getName(), info.getFile().toString()));
         } else {
-            lblRenderer.setToolTipText(tr("Layer ''{0}'' has no modifications to be saved", info.getName()));
+            lblRenderer.setToolTipText(tr("Layer ''{0}'' has no modifications to be saved.", info.getName()));
         }
         return lblRenderer;