Changeset 17709 in josm for trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java

Timestamp:

2021-04-07T21:20:49+02:00 (5 years ago)

Author:

simon04

Message:

fix #20708 - Re-organize the upload dialog

File:

• trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (modified) (7 diffs)

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

@@ -21 +21 @@
 import java.util.Map.Entry;
 
+import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
 import javax.swing.JLabel;
@@ -54 +55 @@
     private transient Map<UploadStrategy, JRadioButton> rbStrategy;
     private transient Map<UploadStrategy, JLabel> lblNumRequests;
-    private transient Map<UploadStrategy, JMultilineLabel> lblStrategies;
     private final JosmTextField tfChunkSize = new JosmTextField(4);
     private final JPanel pnlMultiChangesetPolicyPanel = new JPanel(new GridBagLayout());
@@ -74 +74 @@
     protected JPanel buildUploadStrategyPanel() {
         JPanel pnl = new JPanel(new GridBagLayout());
+        pnl.setBorder(BorderFactory.createTitledBorder(tr("Please select the upload strategy:")));
         ButtonGroup bgStrategies = new ButtonGroup();
         rbStrategy = new EnumMap<>(UploadStrategy.class);
-        lblStrategies = new EnumMap<>(UploadStrategy.class);
         lblNumRequests = new EnumMap<>(UploadStrategy.class);
         for (UploadStrategy strategy: UploadStrategy.values()) {
             rbStrategy.put(strategy, new JRadioButton());
             lblNumRequests.put(strategy, new JLabel());
-            lblStrategies.put(strategy, new JMultilineLabel(""));
             bgStrategies.add(rbStrategy.get(strategy));
         }
 
-        // -- headline
+        // -- single request strategy
         GridBagConstraints gc = new GridBagConstraints();
         gc.gridx = 0;
-        gc.gridy = 0;
-        gc.weightx = 1.0;
-        gc.weighty = 0.0;
-        gc.gridwidth = 4;
+        gc.gridy = 1;
+        gc.weightx = 0.0;
+        gc.weighty = 0.0;
+        gc.gridwidth = 1;
         gc.fill = GridBagConstraints.HORIZONTAL;
         gc.insets = new Insets(0, 0, 3, 0);
         gc.anchor = GridBagConstraints.FIRST_LINE_START;
-        pnl.add(new JMultilineLabel(tr("Please select the upload strategy:")), gc);
-
-        // -- single request strategy
-        gc.gridx = 0;
-        gc.gridy = 1;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        gc.gridwidth = 1;
-        gc.anchor = GridBagConstraints.FIRST_LINE_START;
-        pnl.add(rbStrategy.get(UploadStrategy.SINGLE_REQUEST_STRATEGY), gc);
-        gc.gridx = 1;
+        JRadioButton radioButton = rbStrategy.get(UploadStrategy.SINGLE_REQUEST_STRATEGY);
+        radioButton.setText(tr("Upload data in one request"));
+        pnl.add(radioButton, gc);
+        gc.gridx = 3;
         gc.gridy = 1;
         gc.weightx = 1.0;
-        gc.weighty = 0.0;
-        gc.gridwidth = 2;
-        JMultilineLabel lbl = lblStrategies.get(UploadStrategy.SINGLE_REQUEST_STRATEGY);
-        lbl.setText(tr("Upload data in one request"));
-        pnl.add(lbl, gc);
-        gc.gridx = 3;
-        gc.gridy = 1;
-        gc.weightx = 0.0;
         gc.weighty = 0.0;
         gc.gridwidth = 1;
@@ -125 +109 @@
         gc.weightx = 0.0;
         gc.weighty = 0.0;
-        pnl.add(rbStrategy.get(UploadStrategy.CHUNKED_DATASET_STRATEGY), gc);
-        gc.gridx = 1;
-        gc.gridy = 2;
-        gc.weightx = 1.0;
-        gc.weighty = 0.0;
-        gc.gridwidth = 1;
-        lbl = lblStrategies.get(UploadStrategy.CHUNKED_DATASET_STRATEGY);
-        lbl.setText(tr("Upload data in chunks of objects. Chunk size: "));
-        pnl.add(lbl, gc);
+        radioButton = rbStrategy.get(UploadStrategy.CHUNKED_DATASET_STRATEGY);
+        radioButton.setText(tr("Upload data in chunks of objects. Chunk size: "));
+        pnl.add(radioButton, gc);
         gc.gridx = 2;
         gc.gridy = 2;
@@ -152 +130 @@
         gc.weightx = 0.0;
         gc.weighty = 0.0;
-        pnl.add(rbStrategy.get(UploadStrategy.INDIVIDUAL_OBJECTS_STRATEGY), gc);
-        gc.gridx = 1;
-        gc.gridy = 3;
-        gc.weightx = 1.0;
-        gc.weighty = 0.0;
-        gc.gridwidth = 2;
-        lbl = lblStrategies.get(UploadStrategy.INDIVIDUAL_OBJECTS_STRATEGY);
-        lbl.setText(tr("Upload each object individually"));
-        pnl.add(lbl, gc);
+        radioButton = rbStrategy.get(UploadStrategy.INDIVIDUAL_OBJECTS_STRATEGY);
+        radioButton.setText(tr("Upload each object individually"));
+        pnl.add(radioButton, gc);
         gc.gridx = 3;
         gc.gridy = 3;
@@ -340 +312 @@
         if (maxChunkSize > 0 && numUploadedObjects > maxChunkSize) {
             rbStrategy.get(UploadStrategy.SINGLE_REQUEST_STRATEGY).setEnabled(false);
-            JMultilineLabel lbl = lblStrategies.get(UploadStrategy.SINGLE_REQUEST_STRATEGY);
+            JRadioButton lbl = rbStrategy.get(UploadStrategy.SINGLE_REQUEST_STRATEGY);
             lbl.setText(tr("Upload in one request not possible (too many objects to upload)"));
             lbl.setToolTipText(tr("<html>Cannot upload {0} objects in one request because the<br>"
@@ -361 +333 @@
         } else {
             rbStrategy.get(UploadStrategy.SINGLE_REQUEST_STRATEGY).setEnabled(true);
-            JMultilineLabel lbl = lblStrategies.get(UploadStrategy.SINGLE_REQUEST_STRATEGY);
+            JRadioButton lbl = rbStrategy.get(UploadStrategy.SINGLE_REQUEST_STRATEGY);
             lbl.setText(tr("Upload data in one request"));
             lbl.setToolTipText(null);