Changeset 2165 in josm for trunk

Timestamp:

2009-09-20T11:05:58+02:00 (15 years ago)

Author:

stoecker

Message:

applied #3532 - path by Dave Hansen - infrastructure for faster data access

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/coor/QuadTiling.java (added)
• data/osm/DataSet.java (modified) (2 diffs)
• data/osm/QuadBuckets.java (added)
• gui/conflict/pair/ListMerger.java (modified) (2 diffs)
• gui/conflict/pair/nodes/NodeListMergeModel.java (modified) (2 diffs)
• gui/conflict/pair/relation/RelationMemberListMergeModel.java (modified) (2 diffs)
• gui/conflict/pair/tags/TagMergeItem.java (modified) (4 diffs)
• gui/history/AdjustmentSynchronizer.java (modified) (2 diffs)
• io/OsmApi.java (modified) (1 diff)

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

@@ -17 +17 @@
 
 import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.QuadBuckets;
 
 /**
@@ -38 +39 @@
      * conversion of the whole DataSet by iterating over this data structure.
      */
-    public Collection<Node> nodes = new LinkedList<Node>();
+    public Collection<Node> nodes = new QuadBuckets();
 
     /**

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

@@ -879 +879 @@
         protected void setParticipatingInSynchronizedScrolling(Adjustable adjustable, boolean isParticipating) {
             if (adjustable == null)
-                throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "adjustable"));
+                throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "adjustable"));
 
             if (! synchronizedAdjustables.contains(adjustable))
@@ -920 +920 @@
         protected void adapt(final JCheckBox view, final Adjustable adjustable) throws IllegalArgumentException, IllegalStateException {
             if (adjustable == null)
-                throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "adjustable"));
+                throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "adjustable"));
             if (view == null)
-                throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "view"));
+                throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "view"));
 
             if (! synchronizedAdjustables.contains(adjustable)) {

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java

@@ -31 +31 @@
     public void populate(Way my, Way their) {
         if (my == null)
-            throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "my"));
+            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my"));
         if (their == null)
-            throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "their"));
+            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "their"));
         getMergedEntries().clear();
         getMyEntries().clear();
@@ -65 +65 @@
     public WayNodesConflictResolverCommand buildResolveCommand(Way my, Way their) {
         if (my == null)
-            throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "my"));
+            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my"));
         if (their == null)
-            throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "their"));
+            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "their"));
         if (! isFrozen())
             throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Can't build resolution command"));

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java

@@ -71 +71 @@
     public void populate(Relation my, Relation their) {
         if (my == null)
-            throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "my"));
+            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my"));
         if (their == null)
-            throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "their"));
+            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "their"));
 
         getMergedEntries().clear();
@@ -114 +114 @@
     public RelationMemberConflictResolverCommand buildResolveCommand(Relation my, Relation their) {
         if (my == null)
-            throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "my"));
+            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my"));
         if (their == null)
-            throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "their"));
+            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "their"));
         if (! isFrozen())
             throw new IllegalArgumentException(tr("merged nodes not frozen yet. Can't build resolution command"));

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java

@@ -31 +31 @@
     public TagMergeItem(String key, String myTagValue, String theirTagValue) {
         if (key == null) {
-            throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "key"));
+            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "key"));
         }
         this.key  = key;
@@ -50 +50 @@
      */
     public TagMergeItem(String key, OsmPrimitive my, OsmPrimitive their) {
-        if (key == null) throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "key"));
-        if (my == null) throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "my"));
-        if (their == null) throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "their"));
+        if (key == null) throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "key"));
+        if (my == null) throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my"));
+        if (their == null) throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "their"));
         this.key = key;
         myTagValue = my.get(key);
@@ -66 +66 @@
      */
     public void decide(MergeDecisionType decision) throws IllegalArgumentException {
-        if (decision == null) throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "decision"));
+        if (decision == null) throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "decision"));
         this.mergeDecision = decision;
     }
@@ -96 +96 @@
      */
     public void applyToMyPrimitive(OsmPrimitive primitive) throws IllegalArgumentException, IllegalStateException {
-        if (primitive == null) throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "primitive"));
+        if (primitive == null) throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "primitive"));
         if (mergeDecision == MergeDecisionType.UNDECIDED) {
             throw new IllegalStateException(tr("cannot apply undecided tag merge item"));

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

@@ -76 +76 @@
     protected void setParticipatingInSynchronizedScrolling(Adjustable adjustable, boolean isParticipating) {
         if (adjustable == null)
-            throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "adjustable"));
+            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "adjustable"));
 
         if (! synchronizedAdjustables.contains(adjustable))
@@ -117 +117 @@
     protected void adapt(final JCheckBox view, final Adjustable adjustable) throws IllegalArgumentException, IllegalStateException {
         if (adjustable == null)
-            throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "adjustable"));
+            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "adjustable"));
         if (view == null)
-            throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "view"));
+            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "view"));
 
         if (! synchronizedAdjustables.contains(adjustable)) {

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -132 +132 @@
     protected OsmApi(String serverUrl)  {
         if (serverUrl == null)
-            throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "serverUrl"));
+            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "serverUrl"));
         this.serverUrl = serverUrl;
     }