Changeset 2396 in josm for trunk/src/org/openstreetmap/josm/gui

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/src/org/openstreetmap/josm/gui

Files:

• io/UploadLayerTask.java (modified) (2 diffs)
• layer/OsmDataLayer.java (modified) (3 diffs)

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;