Changeset 11388 in josm

Timestamp:

2016-12-13T12:30:54+01:00 (7 years ago)

Author:

Don-vip

Message:

findbugs - BC_BAD_CAST_TO_CONCRETE_COLLECTION - remove Cloneable interface, use simpler copy constructor

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• Cascade.java (modified) (2 diffs)
• MultiCascade.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java

@@ -19 +19 @@
  * Simple map of properties with dynamic typing.
  */
-public final class Cascade implements Cloneable {
-
-    private Map<String, Object> prop = new HashMap<>();
+public final class Cascade {
+
+    private final Map<String, Object> prop;
 
     private boolean defaultSelectedHandling = true;
 
     private static final Pattern HEX_COLOR_PATTERN = Pattern.compile("#([0-9a-fA-F]{3}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})");
+
+    /**
+     * Constructs a new {@code Cascade}.
+     */
+    public Cascade() {
+        this.prop = new HashMap<>();
+    }
+
+    /**
+     * Constructs a new {@code Cascade} from existing one.
+     * @param other other Cascade
+     */
+    public Cascade(Cascade other) {
+        this.prop = new HashMap<>(other.prop);
+    }
 
     public <T> T get(String key, T def, Class<T> klass) {
@@ -196 +211 @@
 
     @Override
-    public Cascade clone() {
-        try {
-            Cascade c = (Cascade) super.clone();
-            @SuppressWarnings({ "unchecked", "rawtypes" })
-            Map<String, Object> clonedProp = (Map<String, Object>) ((HashMap) this.prop).clone();
-            c.prop = clonedProp;
-            return c;
-        } catch (CloneNotSupportedException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    @Override
     public String toString() {
         StringBuilder res = new StringBuilder("Cascade{ ");

trunk/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java

@@ -39 +39 @@
         if (c == null) {
             if (layers.containsKey("*")) {
-                c = layers.get("*").clone();
+                c = new Cascade(layers.get("*"));
             } else {
                 c = new Cascade();