Changeset 18283 in josm for trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java

Timestamp:

2021-10-17T15:17:42+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21427 - further simplify UploadDialog (patch by marcello, modified)

• The dialog was simplified by combining the function of two radiobuttons and one combobox into one combobox.
• When an open changeset was selected on tab 2, existing tags on the open changeset could overwrite the data the user entered on tab 1. The user might spot this by looking closely at the tag table on tab 2, but then he may not. This non-obvious behaviour was removed.
• The exception thrown when closing an already closed changeset was fixed.
• More cosmetic changes to the dialog.
• Maybe also a solution to #19319, #21387 (added revalidate()).

File:

• trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java (modified) (8 diffs)

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

@@ -103 +103 @@
     }
 
+    protected void build() {
+        setLayout(new GridBagLayout());
+        setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
+        GBC gbc = GBC.eop().fill(GBC.HORIZONTAL);
+        add(buildUploadCommentPanel(), gbc);
+        add(buildUploadSourcePanel(), gbc);
+        add(pnlUploadParameterSummary, gbc);
+        if (Config.getPref().getBoolean("upload.show.review.request", true)) {
+            add(cbRequestReview, gbc);
+            cbRequestReview.addItemListener(this);
+        }
+        add(areaValidatorFeedback, gbc);
+        add(new JPanel(), GBC.std().fill(GBC.BOTH));
+    }
+
     protected JPanel buildUploadCommentPanel() {
         JPanel pnl = new JPanel(new GridBagLayout());
@@ -114 +129 @@
         editor.addFocusListener(this);
         editor.addActionListener(this);
-        pnl.add(hcbUploadComment, GBC.eol().fill(GBC.HORIZONTAL));
-        pnl.add(uploadCommentFeedback, GBC.eol().insets(0, 3, 0, 0).fill(GBC.HORIZONTAL));
+        GBC gbc = GBC.eol().insets(3).fill(GBC.HORIZONTAL);
+        pnl.add(hcbUploadComment, gbc);
+        pnl.add(uploadCommentFeedback, gbc);
         return pnl;
     }
@@ -142 +158 @@
         obtainSource.add(obtainSourceOnce, GBC.std().anchor(GBC.WEST));
         obtainSource.add(new JLabel(), GBC.eol().fill(GBC.HORIZONTAL));
-        if (Config.getPref().getBoolean("upload.show.automatic.source", true)) {
-            pnl.add(obtainSource, GBC.eol().insets(0, 0, 10, 3).fill(GBC.HORIZONTAL));
-        }
 
         hcbUploadSource.setToolTipText(tr("Enter a source"));
@@ -153 +166 @@
         editor.addFocusListener(this);
         editor.addActionListener(this);
-        pnl.add(hcbUploadSource, GBC.eol().fill(GBC.HORIZONTAL));
-        pnl.add(hcbUploadSourceFeedback, GBC.eol().insets(0, 3, 0, 0).fill(GBC.HORIZONTAL));
-
+        GBC gbc = GBC.eol().insets(3).fill(GBC.HORIZONTAL);
+        if (Config.getPref().getBoolean("upload.show.automatic.source", true)) {
+            pnl.add(obtainSource, gbc);
+        }
+        pnl.add(hcbUploadSource, gbc);
+        pnl.add(hcbUploadSourceFeedback, gbc);
         return pnl;
     }
@@ -162 +178 @@
      * Initializes this life cycle of the panel.
      *
-     * Adds any changeset tags to the map.
+     * Adds the comment and source tags from history, and/or obtains the source from the layer if
+     * the user said so.
      *
      * @param map Map where tags are added to.
@@ -179 +196 @@
         hcbUploadSource.getModel().prefs().load(SOURCE_HISTORY_KEY, getDefaultSources());
         hcbUploadSource.discardAllUndoableEdits();
+        hcbUploadComment.getEditorComponent().requestFocusInWindow();
+        uploadCommentValidator.validate();
+        uploadSourceValidator.validate();
     }
 
@@ -233 +253 @@
     protected List<UploadTextComponentValidator> getUploadTextValidators() {
         return Arrays.asList(areaValidator, uploadCommentValidator, uploadSourceValidator);
-    }
-
-    protected void build() {
-        setLayout(new GridBagLayout());
-        setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
-        GBC gbc = GBC.eol().insets(0, 0, 0, 20).fill(GBC.HORIZONTAL);
-        add(buildUploadCommentPanel(), gbc);
-        add(buildUploadSourcePanel(), gbc);
-        add(pnlUploadParameterSummary, gbc);
-        if (Config.getPref().getBoolean("upload.show.review.request", true)) {
-            add(cbRequestReview, gbc);
-            cbRequestReview.addItemListener(this);
-        }
-        add(areaValidatorFeedback, gbc);
-        add(new JPanel(), GBC.std().fill(GBC.BOTH));
     }
 
@@ -266 +271 @@
         // store current value of obtaining source automatically
         Config.getPref().putBoolean("upload.source.obtainautomatically", obtainSourceAutomatically.isSelected());
-    }
-
-    /**
-     * Initializes the panel for user input
-     */
-    public void startUserInput() {
-        hcbUploadComment.getEditorComponent().requestFocusInWindow();
-        uploadCommentValidator.validate();
-        uploadSourceValidator.validate();
     }