Changeset 8910 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

Timestamp:

2015-10-19T20:25:49+02:00 (9 years ago)

Author:

Don-vip

Message:

add unit test for ConflictAddCommand

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -89 +89 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.FilteredCollection;
 import org.openstreetmap.josm.tools.GBC;
@@ -246 +247 @@
      */
     public static Color getBackgroundColor() {
-        return Main.pref.getColor(marktr("background"), Color.BLACK);
+        return Main.pref != null ? Main.pref.getColor(marktr("background"), Color.BLACK) : Color.BLACK;
     }
 
@@ -254 +255 @@
      */
     public static Color getOutsideColor() {
-        return Main.pref.getColor(marktr("outside downloaded area"), Color.YELLOW);
+        return Main.pref != null ? Main.pref.getColor(marktr("outside downloaded area"), Color.YELLOW) : Color.YELLOW;
     }
 
@@ -281 +282 @@
     public OsmDataLayer(final DataSet data, final String name, final File associatedFile) {
         super(name);
+        CheckParameterUtil.ensureParameterNotNull(data, "data");
         this.data = data;
         this.setAssociatedFile(associatedFile);