Changeset 2025 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2009-09-02T21:17:52+02:00 (15 years ago)

Author:

Gubaer

Message:

new: improved dialog for uploading/saving modified layers on exit
new: improved dialog for uploading/saving modified layers if layers are deleted
new: new progress monitor which can delegate rendering to any Swing component
more setters/getters for properties in OSM data classes (fields are @deprecated); started to update references in the code base

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• MultiFetchServerObjectReader.java (modified) (5 diffs)
• OsmApi.java (modified) (3 diffs)
• OsmExporter.java (modified) (1 diff)
• OsmImporter.java (modified) (1 diff)
• OsmServerWriter.java (modified) (7 diffs)
• OsmWriter.java (modified) (5 diffs)

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

@@ -168 +168 @@
     public MultiFetchServerObjectReader append(Node node) {
         if (node == null) return this;
-        if (node.id == 0) return this;
-        remember(node.id, OsmPrimitiveType.NODE);
+        if (node.getId() == 0) return this;
+        remember(node.getId(), OsmPrimitiveType.NODE);
         return this;
     }
@@ -182 +182 @@
     public MultiFetchServerObjectReader append(Way way) {
         if (way == null) return this;
-        if (way.id == 0) return this;
+        if (way.getId() == 0) return this;
         for (Node node: way.getNodes()) {
-            if (node.id > 0) {
-                remember(node.id, OsmPrimitiveType.NODE);
-            }
-        }
-        remember(way.id, OsmPrimitiveType.WAY);
+            if (node.getId() > 0) {
+                remember(node.getId(), OsmPrimitiveType.NODE);
+            }
+        }
+        remember(way.getId(), OsmPrimitiveType.WAY);
         return this;
     }
@@ -201 +201 @@
     public MultiFetchServerObjectReader append(Relation relation) {
         if (relation == null) return this;
-        if (relation.id == 0) return this;
-        remember(relation.id, OsmPrimitiveType.RELATION);
+        if (relation.getId() == 0) return this;
+        remember(relation.getId(), OsmPrimitiveType.RELATION);
         for (RelationMember member : relation.getMembers()) {
             if (OsmPrimitiveType.from(member.member).equals(OsmPrimitiveType.RELATION)) {
                 // avoid infinite recursion in case of cyclic dependencies in relations
                 //
-                if (relations.contains(member.member.id)) {
+                if (relations.contains(member.member.getId())) {
                     continue;
                 }
@@ -373 +373 @@
                 String msg = "";
                 switch(type) {
-                case NODE: msg = tr("Fetching node with id {0} from ''{1}''", id, OsmApi.getOsmApi().getBaseUrl()); break;
-                case WAY: msg = tr("Fetching way with id {0} from ''{1}''", id, OsmApi.getOsmApi().getBaseUrl()); break;
-                case RELATION: msg = tr("Fetching relation with id {0} from ''{1}''", id, OsmApi.getOsmApi().getBaseUrl()); break;
+                    case NODE: msg = tr("Fetching node with id {0} from ''{1}''", id, OsmApi.getOsmApi().getBaseUrl()); break;
+                    case WAY: msg = tr("Fetching way with id {0} from ''{1}''", id, OsmApi.getOsmApi().getBaseUrl()); break;
+                    case RELATION: msg = tr("Fetching relation with id {0} from ''{1}''", id, OsmApi.getOsmApi().getBaseUrl()); break;
                 }
                 progressMonitor.setCustomText(msg);
@@ -411 +411 @@
         String msg = "";
         switch(type) {
-        case NODE: msg = tr("Fetching a package of nodes from ''{0}''", OsmApi.getOsmApi().getBaseUrl()); break;
-        case WAY:  msg = tr("Fetching a package of ways from ''{0}''", OsmApi.getOsmApi().getBaseUrl()); break;
-        case RELATION:  msg = tr("Fetching a package of relations from ''{0}''", OsmApi.getOsmApi().getBaseUrl()); break;
+            case NODE: msg = tr("Fetching a package of nodes from ''{0}''", OsmApi.getOsmApi().getBaseUrl()); break;
+            case WAY:  msg = tr("Fetching a package of ways from ''{0}''", OsmApi.getOsmApi().getBaseUrl()); break;
+            case RELATION:  msg = tr("Fetching a package of relations from ''{0}''", OsmApi.getOsmApi().getBaseUrl()); break;
         }
         progressMonitor.setCustomText(msg);

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

@@ -251 +251 @@
         if (version.equals("0.5")) {
             // legacy mode does not return the new object version.
-            sendRequest("PUT", OsmPrimitiveType.from(osm).getAPIName()+"/" + osm.id, toXml(osm, true));
+            sendRequest("PUT", OsmPrimitiveType.from(osm).getAPIName()+"/" + osm.getId(), toXml(osm, true));
         } else {
             String ret = null;
             // normal mode (0.6 and up) returns new object version.
             try {
-                ret = sendRequest("PUT", OsmPrimitiveType.from(osm).getAPIName()+"/" + osm.id, toXml(osm, true));
+                ret = sendRequest("PUT", OsmPrimitiveType.from(osm).getAPIName()+"/" + osm.getId(), toXml(osm, true));
                 osm.version = Integer.parseInt(ret.trim());
             } catch(NumberFormatException e) {
-                throw new OsmTransferException(tr("unexpected format of new version of modified primitive ''{0}'', got ''{1}''", osm.id, ret));
+                throw new OsmTransferException(tr("unexpected format of new version of modified primitive ''{0}'', got ''{1}''", osm.getId(), ret));
             }
         }
@@ -303 +303 @@
      */
     public void stopChangeset(ProgressMonitor progressMonitor) throws OsmTransferException {
-        progressMonitor.beginTask(tr("Closing changeset..."));
+        progressMonitor.beginTask(tr("Closing changeset {0}...", changeset.getId()));
         try {
             initialize();
-            sendRequest("PUT", "changeset" + "/" + changeset.id + "/close", null);
+            sendRequest("PUT", "changeset" + "/" + changeset.getId() + "/close", null);
             changeset = null;
         } finally {
@@ -341 +341 @@
             String diff = duv.getDocument();
             try {
-                String diffresult = sendRequest("POST", "changeset/" + changeset.id + "/upload", diff);
+                String diffresult = sendRequest("POST", "changeset/" + changeset.getId() + "/upload", diff);
                 DiffResultReader.parseDiffResult(diffresult, list, processed, duv.getNewIdMap(),
                         progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));

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

@@ -76 +76 @@
                 tmpFile.delete();
             }
-            layer.cleanupAfterSaveToDisk();
+            layer.onPostSaveToFile();
         } catch (IOException e) {
             e.printStackTrace();

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

@@ -50 +50 @@
         Main.main.addLayer(layer);
         layer.fireDataChange();
+        layer.onPostLoadFromFile();
     }
 }

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

@@ -95 +95 @@
                 String msg = "";
                 switch(OsmPrimitiveType.from(osm)) {
-                case NODE: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"); break;
-                case WAY: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"); break;
-                case RELATION: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"); break;
+                    case NODE: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"); break;
+                    case WAY: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"); break;
+                    case RELATION: msg = marktr("{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"); break;
                 }
                 progressMonitor.subTask(
@@ -105 +105 @@
                                 primitives.size(),
                                 time_left_str,
-                                osm.getName() == null ? osm.id : osm.getName(),
-                                        osm.id));
+                                osm.getName() == null ? osm.getId() : osm.getName(),
+                                        osm.getId()));
                 makeApiRequest(osm,progressMonitor);
                 processed.add(osm);
@@ -117 +117 @@
         } finally {
             try {
-                api.stopChangeset(progressMonitor.createSubTaskMonitor(0, false));
+                // starting the changeset may have failed, for instance because the user
+                // cancelled the upload task. Only close the changeset if we currently have
+                // an open changeset
+
+                if (api.getCurrentChangeset() != null && api.getCurrentChangeset().getId() > 0) {
+                    api.stopChangeset(progressMonitor.createSubTaskMonitor(0, false));
+                }
             } catch(Exception e) {
                 Changeset changeset = api.getCurrentChangeset();
-                String changesetId = (changeset == null ? tr("unknown") : Long.toString(changeset.id));
+                String changesetId = (changeset == null ? tr("unknown") : Long.toString(changeset.getId()));
                 logger.warning(tr("Failed to close changeset {0}, will be closed by server after timeout. Exception was: {1}",
                         changesetId, e.toString()));
@@ -149 +155 @@
             } catch (Exception ee) {
                 Changeset changeset = api.getCurrentChangeset();
-                String changesetId = (changeset == null ? tr("unknown") : Long.toString(changeset.id));
+                String changesetId = (changeset == null ? tr("unknown") : Long.toString(changeset.getId()));
                 logger.warning(tr("Failed to close changeset {0}, will be closed by server after timeout. Exception was: {1}",
                         changesetId, ee.toString()));
@@ -166 +172 @@
 
         api.initialize();
-
-        progressMonitor.beginTask("");
 
         try {
@@ -180 +184 @@
 
             if (useChangeset) {
+                progressMonitor.beginTask(tr("Starting to upload in one request ..."));
                 uploadChangesAsDiffUpload(primitives, progressMonitor);
             } else {
+                progressMonitor.beginTask(tr("Starting to upload with one request per primitive ..."));
                 uploadChangesIndividually(primitives, progressMonitor);
             }
@@ -190 +196 @@
 
     void makeApiRequest(OsmPrimitive osm, ProgressMonitor progressMonitor) throws OsmTransferException {
-        if (osm.deleted) {
+        if (osm.isDeleted()) {
             api.deletePrimitive(osm, progressMonitor);
-        } else if (osm.id == 0) {
+        } else if (osm.getId() == 0) {
             api.createPrimitive(osm);
         } else {

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

@@ -85 +85 @@
 
     private boolean shouldWrite(OsmPrimitive osm) {
-        return osm.id != 0 || !osm.deleted;
+        return osm.getId() != 0 || !osm.isDeleted();
     }
 
@@ -155 +155 @@
      */
     private long getUsedId(OsmPrimitive osm) {
-        if (osm.id != 0)
-            return osm.id;
+        if (osm.getId() != 0)
+            return osm.getId();
         if (usedNewIds.containsKey(osm))
             return usedNewIds.get(osm);
@@ -169 +169 @@
             }
             for (Entry<String, String> e : osm.entrySet()) {
-                if ((osm instanceof Changeset) || !("created_by".equals(e.getKey())))
+                if ((osm instanceof Changeset) || !("created_by".equals(e.getKey()))) {
                     out.println("    <tag k='"+ XmlWriter.encode(e.getKey()) +
                             "' v='"+XmlWriter.encode(e.getValue())+ "' />");
+                }
             }
             out.println("  </" + tagname + ">");
@@ -193 +194 @@
         if (!osmConform) {
             String action = null;
-            if (osm.deleted) {
+            if (osm.isDeleted()) {
                 action = "delete";
-            } else if (osm.modified) {
+            } else if (osm.isModified()) {
                 action = "modify";
             }
@@ -209 +210 @@
             out.print(" user='"+XmlWriter.encode(osm.user.name)+"'");
         }
-        out.print(" visible='"+osm.visible+"'");
+        out.print(" visible='"+osm.isVisible()+"'");
         if (osm.version != -1) {
             out.print(" version='"+osm.version+"'");
         }
-        if (this.changeset != null && this.changeset.id != 0) {
-            out.print(" changeset='"+this.changeset.id+"'" );
+        if (this.changeset != null && this.changeset.getId() != 0) {
+            out.print(" changeset='"+this.changeset.getId()+"'" );
         }
     }