Changeset 2850 in josm for trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

Timestamp:

2010-01-13T20:15:02+01:00 (14 years ago)

Author:

mjulius

Message:

fix messages for gui

File:

• trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

@@ -40 +40 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -114 +115 @@
     public HistoryBrowserModel(History history) {
         this();
-        if (history == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "history"));
+        CheckParameterUtil.ensureParameterNotNull(history, "history");
         setHistory(history);
     }
@@ -225 +225 @@
      */
     public TagTableModel getTagTableModel(PointInTimeType pointInTimeType) throws IllegalArgumentException {
-        if (pointInTimeType == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "pointInTimeType"));
+        CheckParameterUtil.ensureParameterNotNull(pointInTimeType, "pointInTimeType");
         if (pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME))
             return currentTagTableModel;
@@ -237 +236 @@
 
     public NodeListTableModel getNodeListTableModel(PointInTimeType pointInTimeType) throws IllegalArgumentException {
-        if (pointInTimeType == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "pointInTimeType"));
+        CheckParameterUtil.ensureParameterNotNull(pointInTimeType, "pointInTimeType");
         if (pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME))
             return currentNodeListTableModel;
@@ -249 +247 @@
 
     public RelationMemberTableModel getRelationMemberTableModel(PointInTimeType pointInTimeType) throws IllegalArgumentException {
-        if (pointInTimeType == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "pointInTimeType"));
+        CheckParameterUtil.ensureParameterNotNull(pointInTimeType, "pointInTimeType");
         if (pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME))
             return currentRelationMemberTableModel;
@@ -273 +270 @@
      */
     public void setReferencePointInTime(HistoryOsmPrimitive reference) throws IllegalArgumentException, IllegalStateException{
-        if (reference == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "reference"));
+        CheckParameterUtil.ensureParameterNotNull(reference, "reference");
         if (history == null)
             throw new IllegalStateException(tr("History not initialized yet. Failed to set reference primitive."));
@@ -304 +300 @@
      */
     public void setCurrentPointInTime(HistoryOsmPrimitive current) throws IllegalArgumentException, IllegalStateException{
-        if (current == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "current"));
+        CheckParameterUtil.ensureParameterNotNull(current, "current");
         if (history == null)
             throw new IllegalStateException(tr("History not initialized yet. Failed to set current primitive."));
@@ -347 +342 @@
      */
     public HistoryOsmPrimitive getPointInTime(PointInTimeType type) throws IllegalArgumentException  {
-        if (type == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "type"));
+        CheckParameterUtil.ensureParameterNotNull(type, "type");
         if (type.equals(PointInTimeType.CURRENT_POINT_IN_TIME))
             return current;