Changeset 6222 in josm for trunk/src/org/openstreetmap/josm/gui/history
- Timestamp:
- 2013-09-08T05:14:39+02:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java
r5627 r6222 8 8 import org.openstreetmap.josm.gui.history.TwoColumnDiff.Item.DiffItemType; 9 9 import org.openstreetmap.josm.tools.Diff; 10 import org.openstreetmap.josm.tools.Utils; 10 11 11 12 /** … … 54 55 Object[] current; 55 56 56 /**57 * The arguments will _not_ be modified58 */59 57 public TwoColumnDiff(Object[] reference, Object[] current) { 60 this.reference = reference;61 this.current = current;58 this.reference = Utils.copyArray(reference); 59 this.current = Utils.copyArray(current); 62 60 referenceDiff = new ArrayList<Item>(); 63 61 currentDiff = new ArrayList<Item>(); 64 62 diff(); 65 63 } 64 66 65 private void diff() { 67 66 Diff diff = new Diff(reference, current); … … 82 81 int inserted = script.inserted; 83 82 while(ia < script.line0 && ib < script.line1){ 84 // System.out.println(" "+a[ia] + "\t "+b[ib]);85 83 Item cell = new Item(DiffItemType.SAME, a[ia]); 86 84 referenceDiff.add(cell); … … 92 90 while(inserted > 0 || deleted > 0) { 93 91 if(inserted > 0 && deleted > 0) { 94 // System.out.println("="+a[ia] + "\t="+b[ib]);95 92 referenceDiff.add(new Item(DiffItemType.CHANGED, a[ia++])); 96 93 currentDiff.add(new Item(DiffItemType.CHANGED, b[ib++])); 97 94 } else if(inserted > 0) { 98 // System.out.println("\t+" + b[ib]);99 95 referenceDiff.add(new Item(DiffItemType.EMPTY, null)); 100 96 currentDiff.add(new Item(DiffItemType.INSERTED, b[ib++])); 101 97 } else if(deleted > 0) { 102 // System.out.println("-"+a[ia]);103 98 referenceDiff.add(new Item(DiffItemType.DELETED, a[ia++])); 104 99 currentDiff.add(new Item(DiffItemType.EMPTY, null)); … … 110 105 } 111 106 while(ia < a.length && ib < b.length) { 112 // System.out.println((ia < a.length ? " "+a[ia]+"\t" : "\t") + (ib < b.length ? " "+b[ib] : ""));113 107 referenceDiff.add(new Item(DiffItemType.SAME, a[ia++])); 114 108 currentDiff.add(new Item(DiffItemType.SAME, b[ib++]));
Note:
See TracChangeset
for help on using the changeset viewer.