Changeset 10309 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2016-06-02T00:26:31+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1182 - Classes that override "clone" should be "Cloneable" and call "super.clone()"

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DataSet.java (modified) (3 diffs)
• gui/layer/geoimage/ImageEntry.java (modified) (1 diff)
• gui/mappaint/Cascade.java (modified) (1 diff)
• tools/CopyList.java (modified) (2 diffs)

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

@@ -132 +132 @@
      */
     public DataSet() {
-        /*
-         * Transparently register as projection change lister. No need to explicitly remove the
-         * the listener, projection change listeners are managed as WeakReferences.
-         */
+        // Transparently register as projection change listener. No need to explicitly remove
+        // the listener, projection change listeners are managed as WeakReferences.
         Main.addProjectionChangeListener(this);
     }
@@ -879 +877 @@
         getReadLock().lock();
         try {
-            DataSet ds = new DataSet();
+            DataSet ds = (DataSet) super.clone();
+            Main.addProjectionChangeListener(ds);
             Map<OsmPrimitive, OsmPrimitive> primMap = new HashMap<>();
             for (Node n : nodes) {
@@ -917 +916 @@
             ds.version = version;
             return ds;
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException(e);
         } finally {
             getReadLock().unlock();

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java

@@ -312 +312 @@
     @Override
     public ImageEntry clone() {
-        Object c;
-        try {
-            c = super.clone();
+        try {
+            return (ImageEntry) super.clone();
         } catch (CloneNotSupportedException e) {
-            throw new RuntimeException(e);
-        }
-        return (ImageEntry) c;
+            throw new IllegalStateException(e);
+        }
     }
 

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

@@ -197 +197 @@
     @Override
     public Cascade clone() {
-        @SuppressWarnings("unchecked")
-        Map<String, Object> clonedProp = (Map<String, Object>) ((HashMap) this.prop).clone();
-        Cascade c = new Cascade();
-        c.prop = clonedProp;
-        return c;
+        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);
+        }
     }
 

trunk/src/org/openstreetmap/josm/tools/CopyList.java

@@ -18 +18 @@
  * @param <E> the type of elements in this list
  */
-public final class CopyList<E> extends AbstractList<E> implements RandomAccess, Cloneable {
+public final class CopyList<E> extends AbstractList<E> implements RandomAccess {
     private E[] array;
     private int size;
@@ -113 +113 @@
 
     // helpers:
-    /**
-     * Returns another independent copy-on-write copy of this <tt>List</tt>
-     * instance. Neither the elements nor the backing storage are copied.
-     *
-     * @return a clone of this <tt>CopyList</tt> instance
-     */
-    @Override
-    public Object clone() {
-        return new CopyList<>(array, size);
-    }
 
     private void rangeCheck(int index) {