Changeset 2396 in josm for trunk

Timestamp:

2009-11-07T07:26:15+01:00 (14 years ago)

Author:

Gubaer

Message:

Made nodes, ways, and relations in DataSet private. Plugin updates to be checked in shortly.
Also added setter/getter for DataSet version.

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/UploadAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (3 diffs)
• src/org/openstreetmap/josm/io/OsmExporter.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/OsmReader.java (modified) (4 diffs)
• test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) (2 diffs)
• test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) (42 diffs)

trunk/src/org/openstreetmap/josm/actions/UploadAction.java

@@ -229 +229 @@
         String lbl = "";
         switch(primitiveType) {
-            case NODE: lbl =  tr("Synchronize node {0} only", id); break;
-            case WAY: lbl =  tr("Synchronize way {0} only", id); break;
-            case RELATION: lbl =  tr("Synchronize relation {0} only", id); break;
+        case NODE: lbl =  tr("Synchronize node {0} only", id); break;
+        case WAY: lbl =  tr("Synchronize way {0} only", id); break;
+        case RELATION: lbl =  tr("Synchronize relation {0} only", id); break;
         }
         ButtonSpec[] spec = new ButtonSpec[] {
@@ -275 +275 @@
         );
         switch(ret) {
-            case 0: synchronizePrimitive(primitiveType, id); break;
-            case 1: synchronizeDataSet(); break;
-            default: return;
+        case 0: synchronizePrimitive(primitiveType, id); break;
+        case 1: synchronizeDataSet(); break;
+        default: return;
         }
     }
@@ -635 +635 @@
                     try {
                         getProgressMonitor().subTask(tr("Uploading {0} objects ...", toUpload.size()));
-                        writer.uploadOsm(layer.data.version, toUpload, changeset, getProgressMonitor().createSubTaskMonitor(1, false));
+                        writer.uploadOsm(layer.data.getVersion(), toUpload, changeset, getProgressMonitor().createSubTaskMonitor(1, false));
                         processedPrimitives.addAll(writer.getProcessedPrimitives());
                         // if we get here we've successfully uploaded the data. Exit the loop.

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

@@ -52 +52 @@
      * The API version that created this data set, if any.
      */
-    public String version;
+    private String version;
+
+    /**
+     * Replies the API version this dataset was created from. May be null.
+     * 
+     * @return the API version this dataset was created from. May be null.
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * Sets the API version this dataset was created from.
+     * 
+     * @param version the API version, i.e. "0.5" or "0.6"
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
 
     /**
      * All nodes goes here, even when included in other data (ways etc). This enables the instant
      * conversion of the whole DataSet by iterating over this data structure.
-     * @deprecated Use getNodes() for read-only operations, addPrimitive() and removePrimitive() for modifications
-     */
-    @Deprecated
-    public QuadBuckets<Node> nodes = new QuadBuckets<Node>();
-
+     */
+    private QuadBuckets<Node> nodes = new QuadBuckets<Node>();
+
+    /**
+     * Replies an unmodifiable collection of nodes in this dataset
+     * 
+     * @return an unmodifiable collection of nodes in this dataset
+     */
     public Collection<Node> getNodes() {
         return Collections.unmodifiableCollection(nodes);
@@ -74 +95 @@
      *
      * The way nodes are stored only in the way list.
-     * @deprecated Use getWays() for read-only operations, addPrimitive() and removePrimitive() for modifications
-     */
-    @Deprecated
-    public QuadBuckets<Way> ways = new QuadBuckets<Way>();
-
+     */
+    private QuadBuckets<Way> ways = new QuadBuckets<Way>();
+
+    /**
+     * Replies an unmodifiable collection of ways in this dataset
+     * 
+     * @return an unmodifiable collection of ways in this dataset
+     */
     public Collection<Way> getWays() {
         return Collections.unmodifiableCollection(ways);
@@ -89 +113 @@
     /**
      * All relations/relationships
-     * @deprecated Use getRelations() for read-only operations, addPrimitive() and removePrimitive() for modifications
-     */
-    @Deprecated
-    public Collection<Relation> relations = new LinkedList<Relation>();
-
+     */
+    private Collection<Relation> relations = new LinkedList<Relation>();
+
+    /**
+     * Replies an unmodifiable collection of relations in this dataset
+     * 
+     * @return an unmodifiable collection of relations in this dataset
+     */
     public Collection<Relation> getRelations() {
         return Collections.unmodifiableCollection(relations);
@@ -703 +730 @@
         }
     }
+
+    /**
+     * Removes all primitives from the dataset and resets the currently selected primitives
+     * to the empty collection. Also notifies selection change listeners if necessary.
+     * 
+     */
+    public void clear() {
+        if (!selectedPrimitives.isEmpty()) {
+            selectedPrimitives.clear();
+            fireSelectionChanged();
+        }
+        nodes.clear();
+        ways.clear();
+        relations.clear();
+    }
 }

trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java

@@ -10 +10 @@
 import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.osm.Changeset;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -121 +120 @@
                     ProgressMonitor m = monitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
                     if (isCancelled()) return;
-                    writer.uploadOsm(layer.data.version, toUpload, changeset, m);
+                    writer.uploadOsm(layer.data.getVersion(), toUpload, changeset, m);
                     processedPrimitives.addAll(writer.getProcessedPrimitives());
                     break;

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -256 +256 @@
         tool += trn("{0} way", "{0} ways", ways, ways);
 
-        if (data.version != null) {
-            tool += ", " + tr("version {0}", data.version);
+        if (data.getVersion() != null) {
+            tool += ", " + tr("version {0}", data.getVersion());
         }
         File f = getAssociatedFile();
@@ -292 +292 @@
 
         // copy the merged layer's API version, downgrade if required
-        if (data.version == null) {
-            data.version = from.version;
-        } else if ("0.5".equals(data.version) ^ "0.5".equals(from.version)) {
+        if (data.getVersion() == null) {
+            data.setVersion(from.getVersion());
+        } else if ("0.5".equals(data.getVersion()) ^ "0.5".equals(from.getVersion())) {
             System.err.println(tr("Warning: mixing 0.6 and 0.5 data results in version 0.5"));
-            data.version = "0.5";
+            data.setVersion("0.5");
         }
 
@@ -522 +522 @@
         p.add(new JLabel(wayText, ImageProvider.get("data", "way"), JLabel.HORIZONTAL), GBC.eop().insets(15,0,0,0));
         p.add(new JLabel(relationText, ImageProvider.get("data", "relation"), JLabel.HORIZONTAL), GBC.eop().insets(15,0,0,0));
-        p.add(new JLabel(tr("API version: {0}", (data.version != null) ? data.version : tr("unset"))));
+        p.add(new JLabel(tr("API version: {0}", (data.getVersion() != null) ? data.getVersion() : tr("unset"))));
 
         return p;

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

@@ -66 +66 @@
             Writer writer = new OutputStreamWriter(out, "UTF-8");
 
-            OsmWriter w = new OsmWriter(new PrintWriter(writer), false, layer.data.version);
+            OsmWriter w = new OsmWriter(new PrintWriter(writer), false, layer.data.getVersion());
             w.header();
             w.writeDataSources(layer.data);

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

@@ -184 +184 @@
                 // save generator attribute for later use when creating DataSource objects
                 generator = atts.getValue("generator");
-                ds.version = v;
+                ds.setVersion(v);
 
             } else if (qName.equals("bounds")) {
@@ -348 +348 @@
                     throwException(tr("Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got {1}.", Long.toString(current.id), version));
                 }
-                if (ds.version.equals("0.6")){
+                if (ds.getVersion().equals("0.6")){
                     if (current.version <= 0 && current.id > 0) {
                         throwException(tr("Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got {1}.", Long.toString(current.id), version));
@@ -355 +355 @@
                         current.version = 0;
                     }
-                } else if (ds.version.equals("0.5")) {
+                } else if (ds.getVersion().equals("0.5")) {
                     if (current.version <= 0 && current.id > 0) {
                         System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.id, current.version, 1, "0.5"));
@@ -365 +365 @@
                 } else {
                     // should not happen. API version has been checked before
-                    throwException(tr("Unknown or unsupported API version. Got {0}.", ds.version));
+                    throwException(tr("Unknown or unsupported API version. Got {0}.", ds.getVersion()));
                 }
             } else {
                 // version expected for OSM primitives with an id assigned by the server (id > 0), since API 0.6
                 //
-                if (current.id > 0 && ds.version != null && ds.version.equals("0.6")) {
+                if (current.id > 0 && ds.getVersion() != null && ds.getVersion().equals("0.6")) {
                     throwException(tr("Missing attribute ''version'' on OSM primitive with ID {0}.", Long.toString(current.id)));
-                } else if (current.id > 0 && ds.version != null && ds.version.equals("0.5")) {
+                } else if (current.id > 0 && ds.getVersion() != null && ds.getVersion().equals("0.5")) {
                     // default version in 0.5 files for existing primitives
                     System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.id, current.version, 1, "0.5"));
                     current.version= 1;
-                } else if (current.id <= 0 && ds.version != null && ds.version.equals("0.5")) {
+                } else if (current.id <= 0 && ds.getVersion() != null && ds.getVersion().equals("0.5")) {
                     // default version in 0.5 files for new primitives
                     System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.id, current.version, 0, "0.5"));

trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

@@ -45 +45 @@
     protected static DataSet buildTestDataSet() {
         DataSet ds = new DataSet();
-        ds.version = "0.6";
+        ds.setVersion("0.6");
 
         int numNodes = 1000;
@@ -215 +215 @@
         }
         logger.info(MessageFormat.format("caching test data set in ''{0}'' ...", dataSetCacheOutputFile.toString()));
-        OsmWriter w = new OsmWriter(pw, false, testDataSet.version);
+        OsmWriter w = new OsmWriter(pw, false, testDataSet.getVersion());
         w.header();
         w.writeDataSources(testDataSet);

trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

@@ -109 +109 @@
     protected static DataSet buildTestDataSet() {
         DataSet ds = new DataSet();
-        ds.version = "0.6";
+        ds.setVersion("0.6");
 
         populateTestDataSetWithNodes(ds);
@@ -221 +221 @@
         }
         logger.info(MessageFormat.format("caching test data set in ''{0}'' ...", dataSetCacheOutputFile.toString()));
-        OsmWriter w = new OsmWriter(pw, false, testDataSet.version);
+        OsmWriter w = new OsmWriter(pw, false, testDataSet.getVersion());
         w.header();
         w.writeDataSources(testDataSet);

trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java

@@ -79 +79 @@
     public void nodeSimple_IdenticalNoConflict() {
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node(new LatLon(0,0));
         n.setOsmId(1,1);
@@ -87 +87 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node(new LatLon(0,0));
         n1.setOsmId(1,1);
@@ -114 +114 @@
     public void nodeSimple_locallyUnmodifiedNoConflict() {
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node(new LatLon(0,0));
         n.setOsmId(1,1);
@@ -122 +122 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node(new LatLon(0,0));
         n1.setOsmId(1,2);
@@ -153 +153 @@
     public void nodeSimple_TagConflict() {
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node(new LatLon(0,0));
         n.setOsmId(1,1);
@@ -162 +162 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node(new LatLon(0,0));
         n1.setOsmId(1,2);
@@ -189 +189 @@
     public void nodeSimple_DeleteConflict() {
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node(1);
         n.setCoor(new LatLon(0,0));
@@ -198 +198 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node(new LatLon(0,0));
         n1.setOsmId(1,1);
@@ -223 +223 @@
     public void nodeSimple_VisibleConflict() {
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node(new LatLon(0,0));
         n.setOsmId(1,1);
@@ -231 +231 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node(new LatLon(0,0));
         n1.setOsmId(1,2);
@@ -256 +256 @@
     public void nodeSimple_DeleteConflict_2() {
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node(new LatLon(0,0));
         n.setOsmId(1,1);
@@ -263 +263 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node(new LatLon(0,0));
         n1.setOsmId(1,1);
@@ -286 +286 @@
     public void nodeSimple_DeleteConflict_3() {
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node(new LatLon(1,1));
         n.setDeleted(true);
@@ -292 +292 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node(new LatLon(1,1));
         their.addPrimitive(n1);
@@ -312 +312 @@
     public void nodeSimple_DeleteConflict_4() {
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node(new LatLon(1,1));
         n.setDeleted(true);
@@ -318 +318 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node(new LatLon(1,1));
         n1.setDeleted(true);
@@ -338 +338 @@
     public void nodeSimple_InvisibleNodeInTheirDataset() {
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node(new LatLon(0,0));
         n.setOsmId(1,1);
@@ -345 +345 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node(new LatLon(0,0));
         n1.setOsmId(2,1);
@@ -377 +377 @@
 
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node();
         n.setCoor(new LatLon(0,0));
@@ -387 +387 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node();
         n1.setCoor(new LatLon(0,0));
@@ -418 +418 @@
 
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node();
         n.setCoor(new LatLon(0,0));
@@ -426 +426 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node();
         n1.setCoor(new LatLon(0,0));
@@ -458 +458 @@
 
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
 
         Node n1 = new Node();
@@ -480 +480 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         Node n3 = new Node(new LatLon(0,0));
@@ -525 +525 @@
 
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
 
         Node n1 = new Node(new LatLon(0,0));
@@ -542 +542 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         Node n3 = new Node(new LatLon(0,0));
@@ -593 +593 @@
 
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
 
         Node n1 = new Node(new LatLon(0,0));
@@ -613 +613 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         Node n3 = new Node(new LatLon(0,0));
@@ -664 +664 @@
 
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
 
         Node n1 = new Node(new LatLon(0,0));
@@ -681 +681 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         Way theirWay = new Way();
@@ -710 +710 @@
 
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
 
         Node n1 = new Node(new LatLon(0,0));
@@ -726 +726 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         Node n3 = new Node(new LatLon(0,0));
@@ -763 +763 @@
 
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
 
         Node n1 = new Node(new LatLon(0,0));
@@ -777 +777 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         Node n3 = new Node(new LatLon(0,0));
@@ -815 +815 @@
 
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
 
         Node n1 = new Node(new LatLon(0,0));
@@ -823 +823 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         Node n3 = new Node(new LatLon(0,0));
@@ -871 +871 @@
 
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
 
         Node n1 = new Node(new LatLon(0,0));
@@ -879 +879 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         Node n3 = new Node(new LatLon(0,0));
@@ -922 +922 @@
     public void newIncompleteWay() {
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         Node n1 = new Node(1);
@@ -936 +936 @@
 
         DataSet my = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         MergeVisitor visitor = new MergeVisitor(my,their);
@@ -969 +969 @@
     public void incompleteWayOntoCompleteWay() {
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         // an incomplete node
@@ -986 +986 @@
 
         DataSet my = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         Node n4 = new Node(new LatLon(0,0));