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

Timestamp:

19.02.2010 21:43:42 (2 years ago)

Author:

jttt

Message:

Fix tests

File:

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

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

@@ -79 +79 @@
     protected EntriesSelectionModel mergedEntriesSelectionModel;
 
-    private final ArrayList<PropertyChangeListener> listeners;
+    private final List<PropertyChangeListener> listeners;
     private boolean isFrozen = false;
     private final ComparePairListModel comparePairListModel;
@@ -340 +340 @@
 
     private void copy(ListRole sourceRole, int[] rows, int position) {
+        if (position < 0 || position > getMergedEntriesSize())
+            throw new IllegalArgumentException();
         List<T> newItems = new ArrayList<T>(rows.length);
         List<T> source = entries.get(sourceRole);