Changeset 3025 in josm for trunk/src

Timestamp:

2010-02-19T21:43:42+01:00 (15 years ago)

Author:

jttt

Message:

Fix tests

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadOsmTaskList.java (modified) (1 diff)
• data/osm/DatasetConsistencyTest.java (modified) (1 diff)
• data/osm/DatasetFactory.java (added)
• data/osm/OsmPrimitive.java (modified) (1 diff)
• data/osm/Relation.java (modified) (1 diff)
• gui/conflict/pair/ListMergeModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java

@@ -87 +87 @@
         progressMonitor.beginTask(tr("Updating data"));
         try {
-            List<Rectangle2D> rects = new LinkedList<Rectangle2D>();
+            List<Rectangle2D> rects = new ArrayList<Rectangle2D>(areas.size());
             for (Area a : areas) {
                 rects.add(a.getBounds2D());

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

@@ -124 +124 @@
     public void checkZeroNodesWays() {
         for (Way way:dataSet.getWays()) {
-            if (way.isUsable() && way.getNodesCount() == 0) {
+            if (way.isUsable() && way.isVisible() && way.getNodesCount() == 0) {
                 printError("WARN - ZERO NODES", "Way %s has zero nodes", way);
             } else if (way.isUsable() && way.getNodesCount() == 1) {

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

@@ -873 +873 @@
      */
     public boolean hasSameTags(OsmPrimitive other) {
-        return keySet().equals(other.keySet());
+        return getKeys().equals(other.getKeys());
     }
 

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

@@ -17 +17 @@
 public final class Relation extends OsmPrimitive {
 
-    /**
-     * All members of this relation. Note that after changing this,
-     * makeBackReferences and/or removeBackReferences should be called.
-     *
-     */
     private final List<RelationMember> members = new ArrayList<RelationMember>();
 

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);