Changeset 2846 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

Timestamp:

2010-01-13T20:12:10+01:00 (14 years ago)

Author:

mjulius

Message:

fix messages for gui/conflict

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (modified) (3 diffs)

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

@@ -35 +35 @@
 import javax.swing.event.ListSelectionListener;
 
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -866 +867 @@
          */
         protected void setParticipatingInSynchronizedScrolling(Adjustable adjustable, boolean isParticipating) {
-            if (adjustable == null)
-                throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "adjustable"));
-
+            CheckParameterUtil.ensureParameterNotNull(adjustable, "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. Cannot set participation in synchronized adjustment.", adjustable));
 
             enabledMap.put(adjustable, isParticipating);
@@ -906 +905 @@
          * @exception IllegalArgumentException thrown, if adjustable is null
          */
-        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"));
-            if (view == null)
-                throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "view"));
+        protected void adapt(final JCheckBox view, final Adjustable adjustable) throws IllegalStateException {
+            CheckParameterUtil.ensureParameterNotNull(adjustable, "adjustable");
+            CheckParameterUtil.ensureParameterNotNull(view, "view");
 
             if (! synchronizedAdjustables.contains(adjustable)) {