Changeset 2936 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

Timestamp:

04.02.2010 21:04:02 (2 years ago)

Author:

jttt

Message:

Fixed #4408 confict manager: do not have to solve tag- and element-conficts when deleting

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

@@ -117 +117 @@
     }
 
-    protected ArrayList<T> getMergedEntries() {
+    protected List<T> getMergedEntries() {
         return entries.get(MERGED_ENTRIES);
     }
 
-    protected ArrayList<T> getMyEntries() {
+    protected List<T> getMyEntries() {
         return entries.get(MY_ENTRIES);
     }
 
-    protected ArrayList<T> getTheirEntries() {
+    protected List<T> getTheirEntries() {
         return entries.get(THEIR_ENTRIES);
     }
@@ -230 +230 @@
     protected void copyToTop(ListRole role, int []rows) {
         copy(role, rows, 0);
-        fireModelDataChanged();
         mergedEntriesSelectionModel.setSelectionInterval(0, rows.length -1);
     }
@@ -267 +266 @@
     public void copyToEnd(ListRole source, int [] rows) {
         copy(source, rows, getMergedEntriesSize());
-        fireModelDataChanged();
         mergedEntriesSelectionModel.setSelectionInterval(getMergedEntriesSize()-rows.length, getMergedEntriesSize() -1);
 
@@ -292 +290 @@
     public void copyTheirToEnd(int [] rows) {
         copyToEnd(THEIR_ENTRIES, rows);
+    }
+
+    public void clearMerged() {
+        getMergedEntries().clear();
+        fireModelDataChanged();
     }
 
@@ -304 +307 @@
         }
         getMergedEntries().addAll(position, newItems);
+        fireModelDataChanged();
     }
 
@@ -318 +322 @@
     protected void copyBeforeCurrent(ListRole source, int [] rows, int current) {
         copy(source, rows, current);
-        fireModelDataChanged();
         mergedEntriesSelectionModel.setSelectionInterval(current, current + rows.length-1);
     }
@@ -360 +363 @@
     protected void copyAfterCurrent(ListRole source, int [] rows, int current) {
         copy(source, rows, current + 1);
-        fireModelDataChanged();
         mergedEntriesSelectionModel.setSelectionInterval(current+1, current + rows.length-1);
         notifyObservers();
@@ -404 +406 @@
             // can't move up
             return;
-        ArrayList<T> mergedEntries = getMergedEntries();
+        List<T> mergedEntries = getMergedEntries();
         for (int row: rows) {
             T n = mergedEntries.get(row);
@@ -427 +429 @@
         if (rows == null || rows.length == 0)
             return;
-        ArrayList<T> mergedEntries = getMergedEntries();
+        List<T> mergedEntries = getMergedEntries();
         if (rows[rows.length -1] == mergedEntries.size() -1)
             // can't move down
@@ -455 +457 @@
             return;
 
-        ArrayList<T> mergedEntries = getMergedEntries();
+        List<T> mergedEntries = getMergedEntries();
 
         for (int i = rows.length-1; i>=0;i--) {