Changeset 7204 in josm for trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java

Timestamp:

2014-06-01T14:07:18+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10086 - fix EDT violation causing freeze of Save/upload dialog for empty or conflicting layers

File:

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

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

@@ -16 +16 @@
     /** the osm data layer */
     private OsmDataLayer layer;
+    private boolean doCheckSaveConditions;
     private boolean doSaveToFile;
     private boolean doUploadToServer;
@@ -23 +24 @@
 
     /**
-     *
+     * Constructs a new {@code SaveLayerInfo}.
      * @param layer the layer. Must not be null.
      * @throws IllegalArgumentException thrown if layer is null
@@ -30 +31 @@
         CheckParameterUtil.ensureParameterNotNull(layer, "layer");
         this.layer = layer;
+        this.doCheckSaveConditions = true;
         this.doSaveToFile = layer.requiresSaveToFile();
         this.doUploadToServer = layer.requiresUploadToServer() && !layer.isUploadDiscouraged();
@@ -42 +44 @@
     public OsmDataLayer getLayer() {
         return layer;
+    }
+
+    /**
+     * Replies true if preconditions should be checked before saving; false, otherwise
+     *
+     * @return true if preconditions should be checked before saving; false, otherwise
+     * @since 7204
+     */
+    public boolean isDoCheckSaveConditions() {
+        return doCheckSaveConditions;
+    }
+
+    /**
+     * Sets whether preconditions should be checked before saving
+     *
+     * @param doCheckSaveConditions true to check save preconditions; false, to skip checking
+     * @since 7204
+     */
+    public void setDoCheckSaveConditions(boolean doCheckSaveConditions) {
+        this.doCheckSaveConditions = doCheckSaveConditions;
     }