Changeset 6222 in josm for trunk/src/org/openstreetmap/josm/gui/history

Timestamp:

2013-09-08T05:14:39+02:00 (11 years ago)

Author:

Don-vip

Message:

Make some more defensive copies of user-supplied arrays, javadoc

File:

• trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java (modified) (5 diffs)

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

@@ -8 +8 @@
 import org.openstreetmap.josm.gui.history.TwoColumnDiff.Item.DiffItemType;
 import org.openstreetmap.josm.tools.Diff;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -54 +55 @@
     Object[] current;
 
-    /**
-     * The arguments will _not_ be modified
-     */
     public TwoColumnDiff(Object[] reference, Object[] current) {
-        this.reference = reference;
-        this.current = current;
+        this.reference = Utils.copyArray(reference);
+        this.current = Utils.copyArray(current);
         referenceDiff = new ArrayList<Item>();
         currentDiff = new ArrayList<Item>();
         diff();
     }
+    
     private void diff() {
         Diff diff = new Diff(reference, current);
@@ -82 +81 @@
             int inserted = script.inserted;
             while(ia < script.line0 && ib < script.line1){
-                // System.out.println(" "+a[ia] + "\t "+b[ib]);
                 Item cell = new Item(DiffItemType.SAME, a[ia]);
                 referenceDiff.add(cell);
@@ -92 +90 @@
             while(inserted > 0 || deleted > 0) {
                 if(inserted > 0 && deleted > 0) {
-                    // System.out.println("="+a[ia] + "\t="+b[ib]);
                     referenceDiff.add(new Item(DiffItemType.CHANGED, a[ia++]));
                     currentDiff.add(new Item(DiffItemType.CHANGED, b[ib++]));
                 } else if(inserted > 0) {
-                    // System.out.println("\t+" + b[ib]);
                     referenceDiff.add(new Item(DiffItemType.EMPTY, null));
                     currentDiff.add(new Item(DiffItemType.INSERTED, b[ib++]));
                 } else if(deleted > 0) {
-                    // System.out.println("-"+a[ia]);
                     referenceDiff.add(new Item(DiffItemType.DELETED, a[ia++]));
                     currentDiff.add(new Item(DiffItemType.EMPTY, null));
@@ -110 +105 @@
         }
         while(ia < a.length && ib < b.length) {
-            // System.out.println((ia < a.length ? " "+a[ia]+"\t" : "\t") + (ib < b.length ? " "+b[ib] : ""));
             referenceDiff.add(new Item(DiffItemType.SAME, a[ia++]));
             currentDiff.add(new Item(DiffItemType.SAME, b[ib++]));