Changeset 2045 in josm for trunk/src/org

Timestamp:

2009-09-03T22:15:27+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3386: Upload dialog has empty areas when the changeset doesn't include all of add/modify/delete operations

File:

• trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/UploadAction.java

@@ -590 +590 @@
         private JLabel lblUpdate;
         private JLabel lblDelete;
+        private JPanel pnlLists;
         private JCheckBox cbUseAtomicUpload;
         private SuggestingJHistoryComboBox cmt;
@@ -602 +603 @@
 
         protected JPanel buildListsPanel() {
-            JPanel pnl = new JPanel();
-            pnl.setLayout(new GridBagLayout());
-
-            GridBagConstraints gcLabel = new GridBagConstraints();
-            gcLabel.fill = GridBagConstraints.HORIZONTAL;
-            gcLabel.weightx = 1.0;
-            gcLabel.weighty = 0.0;
-            gcLabel.anchor = GridBagConstraints.FIRST_LINE_START;
-
-            GridBagConstraints gcList = new GridBagConstraints();
-            gcList.fill = GridBagConstraints.BOTH;
-            gcList.weightx = 1.0;
-            gcList.weighty = 1.0;
-            gcList.anchor = GridBagConstraints.CENTER;
-
-            gcLabel.gridy = 0;
-            pnl.add(lblAdd = new JLabel(tr("Objects to add:")), gcLabel);
-
-            gcList.gridy = 1;
-            pnl.add(new JScrollPane(lstAdd), gcList);
-
-            gcLabel.gridy = 2;
-            pnl.add(lblUpdate = new JLabel(tr("Objects to modify:")), gcLabel);
-
-            gcList.gridy = 3;
-            pnl.add(new JScrollPane(lstUpdate), gcList);
-
-            gcLabel.gridy = 4;
-            pnl.add(lblDelete = new JLabel(tr("Objects to delete:")), gcLabel);
-
-            gcList.gridy = 5;
-            pnl.add(new JScrollPane(lstDelete), gcList);
-            return pnl;
+            pnlLists = new JPanel();
+            pnlLists.setLayout(new GridBagLayout());
+
+            return pnlLists;
         }
 
@@ -741 +713 @@
         public void setUploadedPrimitives(Collection<OsmPrimitive> add, Collection<OsmPrimitive> update, Collection<OsmPrimitive> delete) {
             lstAdd.setListData(add.toArray());
-            lstAdd.setVisible(!add.isEmpty());
-            lblAdd.setVisible(!add.isEmpty());
             lstUpdate.setListData(update.toArray());
-            lstUpdate.setVisible(!update.isEmpty());
-            lblUpdate.setVisible(!update.isEmpty());
             lstDelete.setListData(delete.toArray());
-            lstDelete.setVisible(!delete.isEmpty());
-            lblDelete.setVisible(!delete.isEmpty());
+
+
+            GridBagConstraints gcLabel = new GridBagConstraints();
+            gcLabel.fill = GridBagConstraints.HORIZONTAL;
+            gcLabel.weightx = 1.0;
+            gcLabel.weighty = 0.0;
+            gcLabel.anchor = GridBagConstraints.FIRST_LINE_START;
+
+            GridBagConstraints gcList = new GridBagConstraints();
+            gcList.fill = GridBagConstraints.BOTH;
+            gcList.weightx = 1.0;
+            gcList.weighty = 1.0;
+            gcList.anchor = GridBagConstraints.CENTER;
+            pnlLists.removeAll();
+            int y = -1;
+            if (!add.isEmpty()) {
+                y++;
+                gcLabel.gridy = y;
+                pnlLists.add(lblAdd = new JLabel(tr("Objects to add:")), gcLabel);
+                y++;
+                gcList.gridy = y;
+                pnlLists.add(new JScrollPane(lstAdd), gcList);
+            }
+            if (!update.isEmpty()) {
+                y++;
+                gcLabel.gridy = y;
+                pnlLists.add(lblUpdate = new JLabel(tr("Objects to modify:")), gcLabel);
+                y++;
+                gcList.gridy = y;
+                pnlLists.add(new JScrollPane(lstUpdate), gcList);
+            }
+            if (!delete.isEmpty()) {
+                y++;
+                gcLabel.gridy = y;
+                pnlLists.add(lblDelete = new JLabel(tr("Objects to delete:")), gcLabel);
+                y++;
+                gcList.gridy = y;
+                pnlLists.add(new JScrollPane(lstDelete), gcList);
+            }
         }