Changeset 2081 in josm for trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

Timestamp:

08.09.2009 22:56:02 (3 years ago)

Author:

Gubaer

Message:

fixed #3393: loooong delay when using presets with a large osm file - further improvement; next step could be to turn UploadHooks into an asynchronous task; ApiPreconditionChecker loops over all keys in all upload primitives!
fixed #3435: Switching the changeset type deletes any changeset tags that have been set
fixed #3430: Entering comment=* manually in the changeset tags dialog gets ignored
fixed #3431: Upload dialog pops up again if no comment is provided
fixed #3429: created_by=* includes the wrong language when uploading from a new layer

File:

• trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (modified) (4 diffs)

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

@@ -299 +299 @@
         public void cancel() {
             switch(model.getMode()) {
-                case EDITING_DATA: cancelWhenInEditingModel(); break;
-                case UPLOADING_AND_SAVING: cancelSafeAndUploadTask(); break;
+            case EDITING_DATA: cancelWhenInEditingModel(); break;
+            case UPLOADING_AND_SAVING: cancelSafeAndUploadTask(); break;
             }
         }
@@ -334 +334 @@
                 Mode mode = (Mode)evt.getNewValue();
                 switch(mode) {
-                    case EDITING_DATA: setEnabled(true); break;
-                    case UPLOADING_AND_SAVING: setEnabled(false); break;
+                case EDITING_DATA: setEnabled(true); break;
+                case UPLOADING_AND_SAVING: setEnabled(false); break;
                 }
             }
@@ -368 +368 @@
                 SaveLayersModel.Mode mode = (SaveLayersModel.Mode)evt.getNewValue();
                 switch(mode) {
-                    case EDITING_DATA: setEnabled(true); break;
-                    case UPLOADING_AND_SAVING: setEnabled(false); break;
+                case EDITING_DATA: setEnabled(true); break;
+                case UPLOADING_AND_SAVING: setEnabled(false); break;
                 }
             }
@@ -411 +411 @@
                         layerInfo.getLayer(),
                         monitor,
-                        UploadAction.UploadConfirmationHook.getUploadDialogPanel().getChangeset(),
-                        UploadAction.UploadConfirmationHook.getUploadDialogPanel().getChangesetProcessingType()
+                        UploadAction.UploadConfirmationHook.getUploadDialog().getChangeset(),
+                        UploadAction.UploadConfirmationHook.getUploadDialog().getChangesetProcessingType()
                 );
                 currentFuture = worker.submit(currentTask);