Changeset 2599 in josm for trunk

Timestamp:

2009-12-09T21:25:40+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #4130: Chunked upload mode counter is wrong
fixed #4118: Upload dialog too complicated
fixed #4129: Hide the new "Upload data in one request/chunks/individually" behind an expanding "Upload method" box
fixed #2075: API 0.6: don't upload more than 50K edits at once
fixed #4044: Huge uploads never end [should be solved with chunked upload mode]
fixed #4110: Upload dialog spacing wrong
fixed #3386: Upload dialog has empty areas when the changeset doesn't include all of add/modify/delete operations
see #3369: bulk import helper [JOSM now supports multi changesets uploads]

See online help for more details.

Completes r2598

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/io/AbstractUploadTask.java (added)
• gui/io/BasicUploadSettingsPanel.java (added)
• gui/io/ChangesetManagementPanel.java (added)
• gui/io/CloseChangesetTask.java (modified) (1 diff)
• gui/io/ConfigurationParameterRequestHandler.java (added)
• gui/io/DownloadOpenChangesetsTask.java (modified) (5 diffs)
• gui/io/MaxChangesetSizeExceededPolicy.java (added)
• gui/io/OpenChangesetComboBoxModel.java (added)
• gui/io/SaveLayersDialog.java (modified) (3 diffs)
• gui/io/TagSettingsPanel.java (added)
• gui/io/UpdatePrimitivesTask.java (added)
• gui/io/UploadDialog.java (modified) (22 diffs)
• gui/io/UploadLayerTask.java (modified) (4 diffs)
• gui/io/UploadParameterSummaryPanel.java (added)
• gui/io/UploadPrimitivesTask.java (added)
• gui/io/UploadStrategySelectionPanel.java (modified) (15 diffs)
• gui/io/UploadStrategySpecification.java (modified) (1 diff)
• gui/io/UploadedObjectsSummaryPanel.java (added)
• gui/tagging/TagCellEditor.java (modified) (1 diff)
• gui/tagging/TagEditorModel.java (modified) (3 diffs)
• gui/tagging/TagEditorPanel.java (modified) (3 diffs)
• io/Capabilities.java (modified) (2 diffs)
• io/ChangesetClosedException.java (modified) (3 diffs)
• io/MultiFetchServerObjectReader.java (modified) (6 diffs)
• io/OsmApi.java (modified) (2 diffs)
• io/OsmServerWriter.java (modified) (2 diffs)
• tools/CheckParameterUtil.java (added)

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

@@ -60 +60 @@
                     public void run() {
                         for (Changeset cs: closedChangesets) {
-                            UploadDialog.getUploadDialog().setOrUpdateChangeset(cs);
+                            UploadDialog.getUploadDialog().updateListOfChangesetsAfterUploadOperation(cs);
                         }
                     }

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.io;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.IOException;
@@ -13 +15 @@
 import org.openstreetmap.josm.gui.ExceptionDialogUtil;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.gui.io.UploadDialog.OpenChangesetModel;
 import org.openstreetmap.josm.io.ChangesetQuery;
 import org.openstreetmap.josm.io.OsmServerChangesetReader;
@@ -19 +20 @@
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.xml.sax.SAXException;
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -31 +31 @@
     private OsmServerChangesetReader reader;
     private List<Changeset> changesets;
-    private OpenChangesetModel model;
+    private OpenChangesetComboBoxModel model;
     private Exception lastException;
     private UserInfo userInfo;
@@ -40 +40 @@
      * after download
      */
-    public DownloadOpenChangesetsTask(OpenChangesetModel model) {
+    public DownloadOpenChangesetsTask(OpenChangesetComboBoxModel model) {
         super(tr("Downloading open changesets ...", false /* don't ignore exceptions */));
         this.model = model;

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

@@ -33 +33 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.UploadAction;
+import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.gui.ExceptionDialogUtil;
 import org.openstreetmap.josm.gui.SideButton;
@@ -406 +407 @@
                     continue;
                 }
+                final UploadDialog dialog = UploadDialog.getUploadDialog();
+                dialog.setUploadedPrimitives(new APIDataSet(layerInfo.getLayer().data));
+                dialog.setVisible(true);
+                if (dialog.isCanceled()) {
+                    model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELLED);
+                    continue;
+                }
+                dialog.rememberUserInput();
 
                 currentTask = new UploadLayerTask(
@@ -411 +420 @@
                         layerInfo.getLayer(),
                         monitor,
-                        UploadDialog.getUploadDialog().getChangeset(),
-                        UploadDialog.getUploadDialog().isDoCloseAfterUpload()
+                        UploadDialog.getUploadDialog().getChangeset()
                 );
                 currentFuture = worker.submit(currentTask);

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

@@ -1 @@
-// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.io;
 
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.util.ArrayList;
-import java.util.Collection;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
+import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
-import javax.swing.AbstractListModel;
 import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.DefaultComboBoxModel;
 import javax.swing.InputMap;
 import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
 import javax.swing.KeyStroke;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.ListDataEvent;
-import javax.swing.event.ListDataListener;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
-import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
 import org.openstreetmap.josm.gui.help.HelpUtil;
-import org.openstreetmap.josm.gui.tagging.TagEditorModel;
-import org.openstreetmap.josm.gui.tagging.TagEditorPanel;
-import org.openstreetmap.josm.gui.tagging.TagModel;
-import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
-import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.WindowGeometry;
@@ -69 +45 @@
  *
  */
-public class UploadDialog extends JDialog {
-
-    public static final String HISTORY_KEY = "upload.comment.history";
+public class UploadDialog extends JDialog implements PropertyChangeListener{
+    protected static final Logger logger = Logger.getLogger(UploadDialog.class.getName());
 
     /**  the unique instance of the upload dialog */
@@ -88 +63 @@
     }
 
-    /** the list with the added primitives */
-    private PrimitiveList lstAdd;
-    private JLabel lblAdd;
-    private JScrollPane spAdd;
-    /** the list with the updated primitives */
-    private PrimitiveList lstUpdate;
-    private JLabel lblUpdate;
-    private JScrollPane spUpdate;
-    /** the list with the deleted primitives */
-    private PrimitiveList lstDelete;
-    private JLabel lblDelete;
-    private JScrollPane spDelete;
-    /** the panel containing the widgets for the lists of primitives */
-    private JPanel pnlLists;
+    /** the panel with the objects to upload */
+    private UploadedObjectsSummaryPanel pnlUploadedObjects;
+    /** the panel to select the changeset used */
+    private ChangesetManagementPanel pnlChangesetManagement;
+
+    private BasicUploadSettingsPanel pnlBasicUploadSettings;
+
+    private UploadStrategySelectionPanel pnlUploadStrategySelectionPanel;
+
     /** checkbox for selecting whether an atomic upload is to be used  */
-    private TagEditorPanel tagEditorPanel;
+    private TagSettingsPanel pnlTagSettings;
     /** the tabbed pane used below of the list of primitives  */
-    private JTabbedPane southTabbedPane;
+    private JTabbedPane tpConfigPanels;
     /** the upload button */
     private JButton btnUpload;
 
-    private ChangesetSelectionPanel pnlChangesetSelection;
     private boolean canceled = false;
 
-    /**
-     * builds the panel with the lists of primitives
-     *
-     * @return the panel with the lists of primitives
-     */
-    protected JPanel buildListsPanel() {
-        pnlLists = new JPanel();
-        pnlLists.setLayout(new GridBagLayout());
-        // we don't add the lists yet, see setUploadPrimitives()
-        //
-        return pnlLists;
-    }
 
     /**
@@ -133 +90 @@
         JPanel pnl = new JPanel();
         pnl.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-        pnl.setLayout(new GridBagLayout());
-        GridBagConstraints gc = new GridBagConstraints();
-
-        // first the panel with the list in the upper half
+        pnl.setLayout(new BorderLayout());
+
+        // the panel with the list of uploaded objects
         //
-        gc.fill = GridBagConstraints.BOTH;
-        gc.weightx = 1.0;
-        gc.weighty = 1.0;
-        pnl.add(buildListsPanel(), gc);
+        pnl.add(pnlUploadedObjects = new UploadedObjectsSummaryPanel(), BorderLayout.CENTER);
 
         // a tabbed pane with two configuration panels in the
         // lower half
         //
-        southTabbedPane = new JTabbedPane();
-        southTabbedPane.add(new JPanel());
-        tagEditorPanel = new TagEditorPanel();
-        southTabbedPane.add(tagEditorPanel);
-        southTabbedPane.setComponentAt(0, pnlChangesetSelection = new ChangesetSelectionPanel());
-        southTabbedPane.setTitleAt(0, tr("Settings"));
-        southTabbedPane.setToolTipTextAt(0, tr("Decide how to upload the data and which changeset to use"));
-        southTabbedPane.setTitleAt(1, tr("Tags of new changeset"));
-        southTabbedPane.setToolTipTextAt(1, tr("Apply tags to the changeset data is uploaded to"));
-        southTabbedPane.addChangeListener(new TabbedPaneChangeLister());
-        JPanel pnl1 = new JPanel();
-        pnl1.setLayout(new BorderLayout());
-        pnl1.add(southTabbedPane,BorderLayout.CENTER);
-        gc.fill = GridBagConstraints.HORIZONTAL;
-        gc.gridy = 1;
-        gc.weightx = 1.0;
-        gc.weighty = 0.0;
-        pnl.add(pnl1, gc);
+        tpConfigPanels = new JTabbedPane() {
+            @Override
+            public Dimension getPreferredSize() {
+                // make sure the tabbed pane never grabs more space than necessary
+                //
+                return super.getMinimumSize();
+            }
+        };
+        tpConfigPanels.add(new JPanel());
+        tpConfigPanels.add(new JPanel());
+        tpConfigPanels.add(new JPanel());
+        tpConfigPanels.add(new JPanel());
+
+        tpConfigPanels.setComponentAt(0, pnlBasicUploadSettings = new BasicUploadSettingsPanel());
+        tpConfigPanels.setTitleAt(0, tr("Settings"));
+        tpConfigPanels.setToolTipTextAt(0, tr("Decide how to upload the data and which changeset to use"));
+
+        tpConfigPanels.setComponentAt(1,pnlTagSettings = new TagSettingsPanel());
+        tpConfigPanels.setTitleAt(1, tr("Tags of new changeset"));
+        tpConfigPanels.setToolTipTextAt(1, tr("Apply tags to the changeset data is uploaded to"));
+
+        tpConfigPanels.setComponentAt(2,pnlChangesetManagement = new ChangesetManagementPanel());
+        tpConfigPanels.setTitleAt(2, tr("Changesets"));
+        tpConfigPanels.setToolTipTextAt(2, tr("Manage open changesets and select a changeset to upload to"));
+
+        tpConfigPanels.setComponentAt(3, pnlUploadStrategySelectionPanel = new UploadStrategySelectionPanel());
+        tpConfigPanels.setTitleAt(3, tr("Advanced"));
+        tpConfigPanels.setToolTipTextAt(3, tr("Configure advanced settings"));
+
+        pnl.add(tpConfigPanels, BorderLayout.SOUTH);
         return pnl;
     }
@@ -193 +158 @@
                 JComponent.WHEN_IN_FOCUSED_WINDOW
         );
-        pnl.add(new SideButton(new ContextSensitiveHelpAction(ht("/Dialogs/UploadDialog"))));
-        HelpUtil.setHelpContext(getRootPane(),ht("/Dialogs/UploadDialog"));
+        pnl.add(new SideButton(new ContextSensitiveHelpAction(ht("/Dialog/UploadDialog"))));
+        HelpUtil.setHelpContext(getRootPane(),ht("/Dialog/UploadDialog"));
         return pnl;
     }
@@ -202 +167 @@
      */
     protected void build() {
-        setTitle(tr("Upload"));
+        setTitle(tr("Upload to ''{0}''", OsmApi.getOsmApi().getBaseUrl()));
         getContentPane().setLayout(new BorderLayout());
         getContentPane().add(buildContentPanel(), BorderLayout.CENTER);
@@ -208 +173 @@
 
         addWindowListener(new WindowEventHandler());
+
+        // synchronized input of upload comments
+        //
+        //UploadCommentSynchronizer synchronizer = new UploadCommentSynchronizer();
+        //pnlTagSettings.getModeaddTableModelListener(synchronizer);
+        pnlTagSettings.addPropertyChangeListener(pnlBasicUploadSettings);
+        pnlBasicUploadSettings.addPropertyChangeListener(pnlTagSettings);
+
+
+        // make sure the the configuration panels listen to each other
+        // changes
+        //
+        pnlChangesetManagement.addPropertyChangeListener(
+                pnlBasicUploadSettings.getUploadParameterSummaryPanel()
+        );
+        pnlChangesetManagement.addPropertyChangeListener(pnlTagSettings);
+        pnlChangesetManagement.addPropertyChangeListener(this);
+        pnlUploadedObjects.addPropertyChangeListener(
+                pnlBasicUploadSettings.getUploadParameterSummaryPanel()
+        );
+        pnlUploadedObjects.addPropertyChangeListener(pnlUploadStrategySelectionPanel);
+        pnlUploadStrategySelectionPanel.addPropertyChangeListener(
+                pnlBasicUploadSettings.getUploadParameterSummaryPanel()
+        );
+
+        // users can click on either of two links in the upload parameter
+        // summary handler. This installs the handler for these two events.
+        // We simply select the appropriate tab in the tabbed pane with the
+        // configuration dialogs.
+        //
+        pnlBasicUploadSettings.getUploadParameterSummaryPanel().setConfigurationParameterRequestListener(
+                new ConfigurationParameterRequestHandler() {
+                    public void handleUploadStrategyConfigurationRequest() {
+                        tpConfigPanels.setSelectedIndex(3);
+                    }
+                    public void handleChangesetConfigurationRequest() {
+                        tpConfigPanels.setSelectedIndex(2);
+                    }
+                }
+        );
+
+        pnlBasicUploadSettings.setUploadCommentDownFocusTraversalHandler(
+                new AbstractAction() {
+                    public void actionPerformed(ActionEvent e) {
+                        btnUpload.requestFocusInWindow();
+                    }
+                }
+        );
     }
 
@@ -215 +228 @@
     public UploadDialog() {
         super(JOptionPane.getFrameForComponent(Main.parent), true /* modal */);
-        OsmPrimitivRenderer renderer = new OsmPrimitivRenderer();
-
-        // initialize the three lists for primitives
-        //
-        lstAdd = new PrimitiveList();
-        lstAdd.setCellRenderer(renderer);
-        lstAdd.setVisibleRowCount(Math.min(lstAdd.getModel().getSize(), 10));
-        spAdd = new JScrollPane(lstAdd);
-        lblAdd = new JLabel(tr("Objects to add:"));
-
-        lstUpdate = new PrimitiveList();
-        lstUpdate.setCellRenderer(renderer);
-        lstUpdate.setVisibleRowCount(Math.min(lstUpdate.getModel().getSize(), 10));
-        spUpdate = new JScrollPane(lstUpdate);
-        lblUpdate = new JLabel(tr("Objects to modify:"));
-
-        lstDelete = new PrimitiveList();
-        lstDelete.setCellRenderer(renderer);
-        lstDelete.setVisibleRowCount(Math.min(lstDelete.getModel().getSize(), 10));
-        spDelete = new JScrollPane(lstDelete);
-        lblDelete = new JLabel(tr("Objects to delete:"));
-
-        // build the GUI
-        //
         build();
     }
 
     /**
-     * sets the collection of primitives which will be uploaded
-     *
-     * @param add  the collection of primitives to add
-     * @param update the collection of primitives to update
-     * @param delete the collection of primitives to delete
-     */
-    public void setUploadedPrimitives(List<OsmPrimitive> add, List<OsmPrimitive> update, List<OsmPrimitive> delete) {
-        lstAdd.getPrimitiveListModel().setPrimitives(add);
-        lstUpdate.getPrimitiveListModel().setPrimitives(update);
-        lstDelete.getPrimitiveListModel().setPrimitives(delete);
-
-        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;
-            lblAdd.setText(trn("{0} object to add:", "{0} objects to add:", add.size(),add.size()));
-            pnlLists.add(lblAdd, gcLabel);
-            y++;
-            gcList.gridy = y;
-            pnlLists.add(spAdd, gcList);
-        }
-        if (!update.isEmpty()) {
-            y++;
-            gcLabel.gridy = y;
-            lblUpdate.setText(trn("{0} object to modify:", "{0} objects to modify:", update.size(),update.size()));
-            pnlLists.add(lblUpdate, gcLabel);
-            y++;
-            gcList.gridy = y;
-            pnlLists.add(spUpdate, gcList);
-        }
-        if (!delete.isEmpty()) {
-            y++;
-            gcLabel.gridy = y;
-            lblDelete.setText(trn("{0} object to delete:", "{0} objects to delete:", delete.size(),delete.size()));
-            pnlLists.add(lblDelete, gcLabel);
-            y++;
-            gcList.gridy = y;
-            pnlLists.add(spDelete, gcList);
-        }
-        pnlChangesetSelection.setNumUploadedObjects(add.size() + update.size() + delete.size());
+     * Sets the collection of primitives to upload
+     *
+     * @param toUpload the dataset with the objects to upload. If null, assumes the empty
+     * set of objects to upload
+     * 
+     */
+    public void setUploadedPrimitives(APIDataSet toUpload) {
+        if (toUpload == null) {
+            List<OsmPrimitive> emptyList = Collections.emptyList();
+            pnlUploadedObjects.setUploadedPrimitives(emptyList, emptyList, emptyList);
+            return;
+        }
+        pnlUploadedObjects.setUploadedPrimitives(
+                toUpload.getPrimitivesToAdd(),
+                toUpload.getPrimitivesToUpdate(),
+                toUpload.getPrimitivesToDelete()
+        );
     }
 
@@ -301 +255 @@
      */
     public void rememberUserInput() {
-        pnlChangesetSelection.rememberUserInput();
+        pnlBasicUploadSettings.rememberUserInput();
+        pnlUploadStrategySelectionPanel.rememberUserInput();
     }
 
@@ -308 +263 @@
      */
     public void startUserInput() {
-        tagEditorPanel.initAutoCompletion(Main.main.getEditLayer());
-        pnlChangesetSelection.startUserInput();
+        tpConfigPanels.setSelectedIndex(0);
+        pnlBasicUploadSettings.startUserInput();
+        pnlTagSettings.startUserInput();
+        pnlTagSettings.setUploadComment(getUploadComment());
+        pnlTagSettings.initFromChangeset(pnlChangesetManagement.getSelectedChangeset());
+        pnlUploadStrategySelectionPanel.initFromPreferences();
+        UploadParameterSummaryPanel pnl = pnlBasicUploadSettings.getUploadParameterSummaryPanel();
+        pnl.setUploadStrategySpecification(pnlUploadStrategySelectionPanel.getUploadStrategySpecification());
+        pnl.setCloseChangesetAfterNextUpload(pnlChangesetManagement.isCloseChangesetAfterUpload());
+        pnl.setNumObjects(pnlUploadedObjects.getNumObjectsToUpload());
     }
 
@@ -318 +281 @@
      */
     public Changeset getChangeset() {
-        Changeset cs = pnlChangesetSelection.getChangeset();
-        tagEditorPanel.getModel().applyToPrimitive(cs);
-        cs.put("comment", getUploadComment());
+        Changeset cs = pnlChangesetManagement.getSelectedChangeset();
+        if (cs == null) {
+            cs = new Changeset();
+        }
+        cs.setKeys(pnlTagSettings.getTags());
         return cs;
     }
@@ -330 +295 @@
      */
     public UploadStrategySpecification getUploadStrategySpecification() {
-        return pnlChangesetSelection.getUploadStrategySpecification();
+        UploadStrategySpecification spec = pnlUploadStrategySelectionPanel.getUploadStrategySpecification();
+        spec.setCloseChangesetAfterUpload(pnlChangesetManagement.isCloseChangesetAfterUpload());
+        return spec;
     }
 
@@ -343 +310 @@
      * @param cs the changeset
      */
-    public void setOrUpdateChangeset(Changeset cs) {
-        pnlChangesetSelection.setOrUpdateChangeset(cs);
+    public void updateListOfChangesetsAfterUploadOperation(Changeset cs) {
+        pnlChangesetManagement.updateListOfChangesetsAfterUploadOperation(cs);
     }
 
@@ -355 +322 @@
     public void removeChangeset(Changeset cs) {
         if (cs == null) return;
-        pnlChangesetSelection.removeChangeset(cs);
-    }
-
-    /**
-     * Replies true if the changeset is to be closed after the
-     * next upload
-     *
-     * @return true if the changeset is to be closed after the
-     * next upload; false, otherwise
-     */
-    public boolean isDoCloseAfterUpload() {
-        return pnlChangesetSelection.isCloseAfterUpload();
-    }
-
-    /**
-     * Replies the default value for "created_by"
-     *
-     * @return the default value for "created_by"
-     */
-    protected String getDefaultCreatedBy() {
-        Object ua = System.getProperties().get("http.agent");
-        return(ua == null) ? "JOSM" : ua.toString();
+        pnlChangesetManagement.removeChangeset(cs);
     }
 
@@ -385 +331 @@
      */
     protected String getUploadComment() {
-        switch(southTabbedPane.getSelectedIndex()) {
-        case 0:
-            return pnlChangesetSelection.getUploadComment();
-        case 1:
-            TagModel tm = tagEditorPanel.getModel().get("comment");
-            return tm == null? "" : tm.getValue();
-        }
-        return "";
+        return pnlBasicUploadSettings.getUploadComment();
     }
 
@@ -405 +344 @@
 
     /**
-     * Sets whether the dialog was canceld
+     * Sets whether the dialog was canceled
      *
      * @param canceled true, if the dialog is canceled
@@ -423 +362 @@
                     )
             ).apply(this);
+            startUserInput();
         } else if (!visible && isShowing()){
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
         }
         super.setVisible(visible);
-    }
-
-    /**
-     * This change listener is triggered when current tab in the tabbed pane in
-     * the lower half of the dialog is changed.
-     *
-     * It's main purpose is to keep the content in the text field for the changeset
-     * comment in sync with the changeset tag "comment".
-     *
-     */
-    class TabbedPaneChangeLister implements ChangeListener {
-
-        protected boolean hasCommentTag() {
-            TagEditorModel model = tagEditorPanel.getModel();
-            return model.get("comment") != null;
-        }
-
-        protected TagModel getEmptyTag() {
-            TagEditorModel model = tagEditorPanel.getModel();
-            TagModel tm = model.get("");
-            if (tm != null) return tm;
-            tm = new TagModel("", "");
-            model.add(tm);
-            return tm;
-        }
-        protected TagModel getOrCreateCommentTag() {
-            TagEditorModel model = tagEditorPanel.getModel();
-            if (hasCommentTag())
-                return model.get("comment");
-            TagModel tm = getEmptyTag();
-            tm.setName("comment");
-            return tm;
-        }
-
-        protected void removeCommentTag() {
-            TagEditorModel model = tagEditorPanel.getModel();
-            model.delete("comment");
-        }
-
-        protected void refreshCommentTag() {
-            TagModel tm = getOrCreateCommentTag();
-            tm.setName("comment");
-            tm.setValue(pnlChangesetSelection.getUploadComment().trim());
-            if (pnlChangesetSelection.getUploadComment().trim().equals("")) {
-                removeCommentTag();
-            }
-            tagEditorPanel.getModel().fireTableDataChanged();
-        }
-
-        public void stateChanged(ChangeEvent e) {
-            if (southTabbedPane.getSelectedIndex() ==0) {
-                TagModel tm = tagEditorPanel.getModel().get("comment");
-                pnlChangesetSelection.initEditingOfUploadComment(tm == null ? "" : tm.getValue());
-            } else if (southTabbedPane.getSelectedIndex() == 1) {
-                refreshCommentTag();
-            }
-        }
     }
 
@@ -504 +387 @@
                     JOptionPane.ERROR_MESSAGE,
                     ht("/Dialog/UploadDialog#IllegalUploadComment")
-
             );
         }
@@ -518 +400 @@
         }
 
-
         public void actionPerformed(ActionEvent e) {
             if (getUploadComment().trim().length() < 3) {
                 warnIllegalUploadComment();
-                southTabbedPane.setSelectedIndex(0);
-                pnlChangesetSelection.initEditingOfUploadComment(getUploadComment());
+                tpConfigPanels.setSelectedIndex(0);
+                pnlBasicUploadSettings.initEditingOfUploadComment(getUploadComment());
                 return;
             }
@@ -530 +411 @@
                 if (strategy.getChunkSize() == UploadStrategySpecification.UNSPECIFIED_CHUNK_SIZE) {
                     warnIllegalChunkSize();
-                    southTabbedPane.setSelectedIndex(0);
-                    pnlChangesetSelection.initEditingOfChunkSize();
+                    tpConfigPanels.setSelectedIndex(0);
                     return;
                 }
@@ -558 +438 @@
 
     /**
-     * A simple list of OSM primitives.
-     *
-     */
-    class PrimitiveList extends JList {
-        public PrimitiveList() {
-            super(new PrimitiveListModel());
-        }
-
-        public PrimitiveListModel getPrimitiveListModel() {
-            return (PrimitiveListModel)getModel();
-        }
-    }
-
-    /**
-     * A list model for a list of OSM primitives.
-     *
-     */
-    class PrimitiveListModel extends AbstractListModel{
-        private List<OsmPrimitive> primitives;
-
-        public PrimitiveListModel() {
-            primitives = new ArrayList<OsmPrimitive>();
-        }
-
-        public PrimitiveListModel(List<OsmPrimitive> primitives) {
-            setPrimitives(primitives);
-        }
-
-        public void setPrimitives(List<OsmPrimitive> primitives) {
-            if (primitives == null) {
-                this.primitives = new ArrayList<OsmPrimitive>();
-            } else {
-                this.primitives = primitives;
-            }
-            fireContentsChanged(this,0,getSize());
-        }
-
-        public Object getElementAt(int index) {
-            if (primitives == null) return null;
-            return primitives.get(index);
-        }
-
-        public int getSize() {
-            if (primitives == null) return 0;
-            return primitives.size();
-        }
-    }
-
-    /**
      * Listens to window closing events and processes them as cancel events.
      * Listens to window open events and initializes user input
@@ -619 +450 @@
         @Override
         public void windowOpened(WindowEvent e) {
-            startUserInput();
-        }
-    }
-
-    /**
-     * The panel which provides various UI widgets for controlling how to use
-     * changesets during upload.
-     *
-     */
-    class ChangesetSelectionPanel extends JPanel implements ListDataListener{
-
-        private ButtonGroup bgUseNewOrExisting;
-        private JRadioButton rbUseNew;
-        private JRadioButton rbExisting;
-        private JComboBox cbOpenChangesets;
-        private JButton btnRefresh;
-        private JButton btnClose;
-        private JCheckBox cbCloseAfterUpload;
-        private OpenChangesetModel model;
-        private HistoryComboBox cmt;
-        private UploadStrategySelectionPanel pnlUploadStrategy;
-
-        /**
-         * build the panel with the widgets for controlling whether an atomic upload
-         * should be used or not
-         *
-         * @return the panel
-         */
-        protected JPanel buildUploadStrategySelectionPanel() {
-            pnlUploadStrategy = new UploadStrategySelectionPanel();
-            pnlUploadStrategy.initFromPreferences();
-            return pnlUploadStrategy;
-        }
-
-        protected JPanel buildUploadCommentPanel() {
-            JPanel pnl = new JPanel();
-            pnl.setLayout(new GridBagLayout());
-            pnl.add(new JLabel(tr("Provide a brief comment for the changes you are uploading:")), GBC.eol().insets(0, 5, 10, 3));
-            cmt = new HistoryComboBox();
-            cmt.setToolTipText(tr("Enter an upload comment (min. 3 characters)"));
-            List<String> cmtHistory = new LinkedList<String>(Main.pref.getCollection(HISTORY_KEY, new LinkedList<String>()));
-            // we have to reverse the history, because ComboBoxHistory will reverse it again
-            // in addElement()
-            //
-            Collections.reverse(cmtHistory);
-            cmt.setPossibleItems(cmtHistory);
-            cmt.getEditor().addActionListener(
-                    new ActionListener() {
-                        public void actionPerformed(ActionEvent e) {
-                            TagModel tm = tagEditorPanel.getModel().get("comment");
-                            if (tm == null) {
-                                tagEditorPanel.getModel().add(new TagModel("comment", cmt.getText()));
-                            } else {
-                                tm.setValue(cmt.getText());
-                            }
-                            tagEditorPanel.getModel().fireTableDataChanged();
-                        }
-                    }
-            );
-            cmt.getEditor().addActionListener(
-                    new ActionListener() {
-                        public void actionPerformed(ActionEvent e) {
-                            btnUpload.requestFocusInWindow();
-                        }
-                    }
-            );
-            pnl.add(cmt, GBC.eol().fill(GBC.HORIZONTAL));
-            return pnl;
-        }
-
-        protected void build() {
-            setLayout(new GridBagLayout());
-            GridBagConstraints gc = new GridBagConstraints();
-
-            bgUseNewOrExisting = new ButtonGroup();
-
-            // -- atomic upload
-            gc.gridwidth = 4;
-            gc.gridy = 0;
-            gc.fill = GridBagConstraints.HORIZONTAL;
-            gc.weightx = 1.0;
-            gc.anchor = GridBagConstraints.FIRST_LINE_START;
-            add(buildUploadStrategySelectionPanel(), gc);
-
-            // -- changeset command
-            gc.gridwidth = 4;
-            gc.gridy = 1;
-            gc.fill = GridBagConstraints.HORIZONTAL;
-            gc.weightx = 1.0;
-            gc.anchor = GridBagConstraints.FIRST_LINE_START;
-            add(buildUploadCommentPanel(), gc);
-
-            gc.gridwidth = 4;
-            gc.gridy = 2;
-            gc.fill = GridBagConstraints.HORIZONTAL;
-            gc.weightx = 0.0;
-            gc.anchor = GridBagConstraints.FIRST_LINE_START;
-            rbUseNew = new JRadioButton(tr("Open a new changeset"));
-            rbUseNew.setToolTipText(tr("Open a new changeset and use it in the next upload"));
-            bgUseNewOrExisting.add(rbUseNew);
-            add(rbUseNew, gc);
-
-            gc.gridx = 0;
-            gc.gridy = 3;
-            gc.gridwidth = 1;
-            rbExisting = new JRadioButton(tr("Use an open changeset"));
-            rbExisting.setToolTipText(tr("Upload data to an already opened changeset"));
-            bgUseNewOrExisting.add(rbExisting);
-            add(rbExisting, gc);
-
-            gc.gridx = 1;
-            gc.gridy = 3;
-            gc.gridwidth = 1;
-            gc.weightx = 1.0;
-            model = new OpenChangesetModel();
-            cbOpenChangesets = new JComboBox(model);
-            cbOpenChangesets.setToolTipText("Select an open changeset");
-            cbOpenChangesets.setRenderer(new ChangesetCellRenderer());
-            cbOpenChangesets.addItemListener(new ChangesetListItemStateListener());
-            Dimension d = cbOpenChangesets.getPreferredSize();
-            d.width = 200;
-            cbOpenChangesets.setPreferredSize(d);
-            d.width = 100;
-            cbOpenChangesets.setMinimumSize(d);
-            model.addListDataListener(this);
-            add(cbOpenChangesets, gc);
-
-            gc.gridx = 2;
-            gc.gridy = 3;
-            gc.gridwidth = 1;
-            gc.weightx = 0.0;
-            btnRefresh = new JButton(new RefreshAction());
-            add(btnRefresh, gc);
-
-            gc.gridx = 3;
-            gc.gridy = 3;
-            gc.gridwidth = 1;
-            gc.weightx = 0.0;
-            CloseChangesetAction closeChangesetAction = new CloseChangesetAction();
-            btnClose = new JButton(closeChangesetAction);
-            cbOpenChangesets.addItemListener(closeChangesetAction);
-            add(btnClose, gc);
-
-            gc.gridx = 0;
-            gc.gridy = 4;
-            gc.gridwidth = 4;
-            cbCloseAfterUpload = new JCheckBox(tr("Close changeset after upload"));
-            cbCloseAfterUpload.setToolTipText(tr("Select to close the changeset after the next upload"));
-            add(cbCloseAfterUpload, gc);
-            cbCloseAfterUpload.setSelected(true);
-
-            rbUseNew.getModel().addItemListener(new RadioButtonHandler());
-            rbExisting.getModel().addItemListener(new RadioButtonHandler());
-
-            refreshGUI();
-        }
-
-        public ChangesetSelectionPanel() {
-            build();
-        }
-
-        /**
-         * Remembers the user input in the preference settings
-         */
-        public void rememberUserInput() {
-            // store the history of comments
-            cmt.addCurrentItemToHistory();
-            Main.pref.putCollection(HISTORY_KEY, cmt.getHistory());
-            pnlUploadStrategy.saveToPreferences();
-        }
-
-        /**
-         * Initializes the panel for user input
-         */
-        public void startUserInput() {
-            List<String> history = cmt.getHistory();
-            if (history != null && !history.isEmpty()) {
-                cmt.setText(history.get(0));
+            //startUserInput();
+        }
+
+        @Override
+        public void windowActivated(WindowEvent arg0) {
+            if (tpConfigPanels.getSelectedIndex() == 0) {
+                pnlBasicUploadSettings.initEditingOfUploadComment(getUploadComment());
             }
-            cmt.requestFocusInWindow();
-            cmt.getEditor().getEditorComponent().requestFocusInWindow();
-        }
-
-        public void prepareDialogForNextUpload(Changeset cs) {
-            if (cs == null || cs.getId() == 0) {
-                rbUseNew.setSelected(true);
-                cbCloseAfterUpload.setSelected(true);
-            } if (cs.getId() == 0) {
-                rbUseNew.setSelected(true);
-                cbCloseAfterUpload.setSelected(true);
-            } else if (cs.isOpen()) {
-                rbExisting.setSelected(true);
-                cbCloseAfterUpload.setSelected(false);
+        }
+    }
+
+    /* -------------------------------------------------------------------------- */
+    /* Interface PropertyChangeListener                                           */
+    /* -------------------------------------------------------------------------- */
+    public void propertyChange(PropertyChangeEvent evt) {
+        if (evt.getPropertyName().equals(ChangesetManagementPanel.SELECTED_CHANGESET_PROP)) {
+            Changeset cs = (Changeset)evt.getNewValue();
+            if (cs == null) {
+                tpConfigPanels.setTitleAt(1, tr("Tags of new changeset"));
             } else {
-                rbUseNew.setSelected(true);
-                cbCloseAfterUpload.setSelected(true);
+                tpConfigPanels.setTitleAt(1, tr("Tags of changeset {0}", cs.getId()));
             }
         }
-
-        /**
-         * Replies the current upload comment
-         *
-         * @return
-         */
-        public String getUploadComment() {
-            return cmt.getText();
-        }
-
-        /**
-         * Replies the current upload comment
-         *
-         * @return
-         */
-        public void setUploadComment(String uploadComment) {
-            cmt.setText(uploadComment);
-        }
-
-        public void initEditingOfUploadComment(String comment) {
-            setUploadComment(comment);
-            cmt.getEditor().selectAll();
-            cmt.requestFocusInWindow();
-        }
-
-        public void initEditingOfChunkSize() {
-            pnlUploadStrategy.initEditingOfChunkSize();
-        }
-
-        protected void refreshGUI() {
-            rbExisting.setEnabled(model.getSize() > 0);
-            if (model.getSize() == 0) {
-                if (!rbUseNew.isSelected()) {
-                    rbUseNew.setSelected(true);
-                }
-            }
-            cbOpenChangesets.setEnabled(model.getSize() > 0 && rbExisting.isSelected());
-        }
-
-        public void contentsChanged(ListDataEvent e) {
-            refreshGUI();
-        }
-
-        public void intervalAdded(ListDataEvent e) {
-            refreshGUI();
-        }
-
-        public void intervalRemoved(ListDataEvent e) {
-            refreshGUI();
-        }
-
-        public Changeset getChangeset() {
-            if (rbUseNew.isSelected() || cbOpenChangesets.getSelectedItem() == null)
-                return new Changeset();
-            Changeset cs = (Changeset)cbOpenChangesets.getSelectedItem();
-            if (cs == null)
-                return new Changeset();
-            return cs;
-        }
-
-        /**
-         * Replies the {@see UploadStrategySpecification} the user entered in the dialog.
-         * 
-         * @return the {@see UploadStrategySpecification} the user entered in the dialog.
-         */
-        public UploadStrategySpecification getUploadStrategySpecification() {
-            return pnlUploadStrategy.getUploadStrategySpecification();
-        }
-
-        public void setOrUpdateChangeset(Changeset cs) {
-            if (cs == null) {
-                cs = new Changeset();
-                cs.put("created_by", getDefaultCreatedBy());
-                tagEditorPanel.getModel().initFromPrimitive(cs);
-                tagEditorPanel.getModel().appendNewTag();
-                prepareDialogForNextUpload(cs);
-            } else if (cs.getId() == 0) {
-                if (cs.get("created_by") == null) {
-                    cs.put("created_by", getDefaultCreatedBy());
-                }
-                tagEditorPanel.getModel().initFromPrimitive(cs);
-                tagEditorPanel.getModel().appendNewTag();
-                prepareDialogForNextUpload(cs);
-            } else if (cs.getId() > 0 && cs.isOpen()){
-                if (cs.get("created_by") == null) {
-                    cs.put("created_by", getDefaultCreatedBy());
-                }
-                tagEditorPanel.getModel().initFromPrimitive(cs);
-                model.addOrUpdate(cs);
-                cs = model.getChangesetById(cs.getId());
-                cbOpenChangesets.setSelectedItem(cs);
-                prepareDialogForNextUpload(cs);
-            } else if (cs.getId() > 0 && !cs.isOpen()){
-                removeChangeset(cs);
-            }
-        }
-
-        /**
-         * Remove a changeset from the list of open changeset
-         *
-         * @param cs the changeset to be removed. Ignored if null.
-         */
-        public void removeChangeset(Changeset cs) {
-            if (cs ==  null) return;
-            Changeset selected = (Changeset)model.getSelectedItem();
-            model.removeChangeset(cs);
-            if (model.getSize() == 0 || selected == cs) {
-                // no more changesets or removed changeset is the currently selected
-                // changeset? Switch to using a new changeset.
-                //
-                rbUseNew.setSelected(true);
-                model.setSelectedItem(null);
-                southTabbedPane.setTitleAt(1, tr("Tags of new changeset"));
-
-                cs = new Changeset();
-                if (cs.get("created_by") == null) {
-                    cs.put("created_by", getDefaultCreatedBy());
-                    cs.put("comment", getUploadComment());
-                }
-                tagEditorPanel.getModel().initFromPrimitive(cs);
-            }
-            prepareDialogForNextUpload(cs);
-        }
-
-        /**
-         * Sets whether a new changeset is to be used
-         *
-         */
-        public void setUseNewChangeset() {
-            rbUseNew.setSelected(true);
-        }
-
-        /**
-         * Sets whether an existing changeset is to be used
-         */
-        public void setUseExistingChangeset() {
-            rbExisting.setSelected(true);
-            if (cbOpenChangesets.getSelectedItem() == null && model.getSize() > 0) {
-                cbOpenChangesets.setSelectedItem(model.getElementAt(0));
-            }
-        }
-
-        /**
-         * Replies true if the selected changeset should be closed after the
-         * next upload
-         *
-         * @return true if the selected changeset should be closed after the
-         * next upload
-         */
-        public boolean isCloseAfterUpload() {
-            return cbCloseAfterUpload.isSelected();
-        }
-
-        public void setNumUploadedObjects(int numUploadedObjects) {
-            pnlUploadStrategy.setNumUploadedObjects(numUploadedObjects);
-        }
-
-        class RadioButtonHandler implements ItemListener {
-            public void itemStateChanged(ItemEvent e) {
-                if (rbUseNew.isSelected()) {
-                    southTabbedPane.setTitleAt(1, tr("Tags of new changeset"));
-                    // init a new changeset from the currently edited tags
-                    // and the comment field
-                    //
-                    Changeset cs = new Changeset();
-                    tagEditorPanel.getModel().applyToPrimitive(cs);
-                    if (cs.get("created_by") == null) {
-                        cs.put("created_by", getDefaultCreatedBy());
-                    }
-                    cs.put("comment", cmt.getText());
-                    tagEditorPanel.getModel().initFromPrimitive(cs);
-                } else {
-                    if (cbOpenChangesets.getSelectedItem() == null) {
-                        model.selectFirstChangeset();
-                    }
-                    Changeset cs = (Changeset)cbOpenChangesets.getSelectedItem();
-                    if (cs != null) {
-                        cs.put("comment", cmt.getText());
-                        southTabbedPane.setTitleAt(1, tr("Tags of changeset {0}", cs.getId()));
-                        tagEditorPanel.getModel().initFromPrimitive(cs);
-                    }
-                }
-                refreshGUI();
-            }
-        }
-
-        class ChangesetListItemStateListener implements ItemListener {
-            public void itemStateChanged(ItemEvent e) {
-                Changeset cs = (Changeset)cbOpenChangesets.getSelectedItem();
-                if (cs == null) {
-                    southTabbedPane.setTitleAt(1, tr("Tags of new changeset"));
-                    // init a new changeset from the currently edited tags
-                    // and the comment field
-                    //
-                    cs = new Changeset();
-                    tagEditorPanel.getModel().applyToPrimitive(cs);
-                    if (cs.get("created_by") == null) {
-                        cs.put("created_by", getDefaultCreatedBy());
-                    }
-                    cs.put("comment", cmt.getText());
-                    tagEditorPanel.getModel().initFromPrimitive(cs);
-                } else {
-                    southTabbedPane.setTitleAt(1, tr("Tags of changeset {0}", cs.getId()));
-                    if (cs.get("created_by") == null) {
-                        cs.put("created_by", getDefaultCreatedBy());
-                    }
-                    tagEditorPanel.getModel().initFromPrimitive(cs);
-                    if (cs.get("comment") != null) {
-                        cmt.setText(cs.get("comment"));
-                    }
-                }
-            }
-        }
-
-        /**
-         * Refreshes the list of open changesets
-         *
-         */
-        class RefreshAction extends AbstractAction {
-            public RefreshAction() {
-                //putValue(NAME, tr("Reload"));
-                putValue(SHORT_DESCRIPTION, tr("Load the list of your open changesets from the server"));
-                putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh"));
-            }
-
-            public void actionPerformed(ActionEvent e) {
-                DownloadOpenChangesetsTask task = new DownloadOpenChangesetsTask(model);
-                Main.worker.submit(task);
-            }
-        }
-
-        class CloseChangesetAction extends AbstractAction implements ItemListener{
-            public CloseChangesetAction() {
-                putValue(NAME, tr("Close"));
-                putValue(SMALL_ICON, ImageProvider.get("closechangeset"));
-                putValue(SHORT_DESCRIPTION, tr("Close the currently selected open changeset"));
-                refreshEnabledState();
-            }
-
-            public void actionPerformed(ActionEvent e) {
-                Changeset cs = (Changeset)cbOpenChangesets.getSelectedItem();
-                if (cs == null) return;
-                CloseChangesetTask task = new CloseChangesetTask(Collections.singletonList(cs));
-                Main.worker.submit(task);
-            }
-
-            protected void refreshEnabledState() {
-                setEnabled(cbOpenChangesets.getModel().getSize() > 0 && cbOpenChangesets.getSelectedItem() != null);
-            }
-
-            public void itemStateChanged(ItemEvent e) {
-                refreshEnabledState();
-            }
-        }
-    }
-
-    /**
-     * A combobox model for the list of open changesets
-     *
-     */
-    public class OpenChangesetModel extends DefaultComboBoxModel {
-        private List<Changeset> changesets;
-        private long uid;
-        private Changeset selectedChangeset = null;
-
-        protected Changeset getChangesetById(long id) {
-            for (Changeset cs : changesets) {
-                if (cs.getId() == id) return cs;
-            }
-            return null;
-        }
-
-        public OpenChangesetModel() {
-            this.changesets = new ArrayList<Changeset>();
-        }
-
-        protected void internalAddOrUpdate(Changeset cs) {
-            Changeset other = getChangesetById(cs.getId());
-            if (other != null) {
-                cs.cloneFrom(other);
-            } else {
-                changesets.add(cs);
-            }
-        }
-
-        public void addOrUpdate(Changeset cs) {
-            if (cs.getId() <= 0 )
-                throw new IllegalArgumentException(tr("Changeset ID > 0 expected. Got {0}.", cs.getId()));
-            internalAddOrUpdate(cs);
-            fireContentsChanged(this, 0, getSize());
-        }
-
-        public void remove(long id) {
-            Changeset cs = getChangesetById(id);
-            if (cs != null) {
-                changesets.remove(cs);
-            }
-            fireContentsChanged(this, 0, getSize());
-        }
-
-        public void setChangesets(Collection<Changeset> changesets) {
-            this.changesets.clear();
-            if (changesets != null) {
-                for (Changeset cs: changesets) {
-                    internalAddOrUpdate(cs);
-                }
-            }
-            fireContentsChanged(this, 0, getSize());
-            if (getSelectedItem() == null && !this.changesets.isEmpty()) {
-                setSelectedItem(this.changesets.get(0));
-            } else if (getSelectedItem() != null) {
-                if (changesets.contains(getSelectedItem())) {
-                    setSelectedItem(getSelectedItem());
-                } else if (!this.changesets.isEmpty()){
-                    setSelectedItem(this.changesets.get(0));
-                } else {
-                    setSelectedItem(null);
-                }
-            } else {
-                setSelectedItem(null);
-            }
-        }
-
-        public void setUserId(long uid) {
-            this.uid = uid;
-        }
-
-        public long getUserId() {
-            return uid;
-        }
-
-        public void selectFirstChangeset() {
-            if (changesets == null || changesets.isEmpty()) return;
-            setSelectedItem(changesets.get(0));
-        }
-
-        public void removeChangeset(Changeset cs) {
-            if (cs == null) return;
-            changesets.remove(cs);
-            if (selectedChangeset == cs) {
-                selectFirstChangeset();
-            }
-            fireContentsChanged(this, 0, getSize());
-        }
-        /* ------------------------------------------------------------------------------------ */
-        /* ComboBoxModel                                                                        */
-        /* ------------------------------------------------------------------------------------ */
-        @Override
-        public Object getElementAt(int index) {
-            return changesets.get(index);
-        }
-
-        @Override
-        public int getIndexOf(Object anObject) {
-            return changesets.indexOf(anObject);
-        }
-
-        @Override
-        public int getSize() {
-            return changesets.size();
-        }
-
-        @Override
-        public Object getSelectedItem() {
-            return selectedChangeset;
-        }
-
-        @Override
-        public void setSelectedItem(Object anObject) {
-            if (anObject == null) {
-                this.selectedChangeset = null;
-                super.setSelectedItem(null);
-                return;
-            }
-            if (! (anObject instanceof Changeset)) return;
-            Changeset cs = (Changeset)anObject;
-            if (cs.getId() == 0 || ! cs.isOpen()) return;
-            Changeset candidate = getChangesetById(cs.getId());
-            if (candidate == null) return;
-            this.selectedChangeset = candidate;
-            super.setSelectedItem(selectedChangeset);
-        }
     }
 }

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

@@ -41 +41 @@
     private ProgressMonitor monitor;
     private Changeset changeset;
-    private boolean closeChangesetAfterUpload;
     private Collection<OsmPrimitive> toUpload;
     private HashSet<OsmPrimitive> processedPrimitives;
@@ -53 +52 @@
      * @param monitor  a progress monitor. If monitor is null, uses {@see NullProgressMonitor#INSTANCE}
      * @param changeset the changeset to be used
-     * @param closeChangesetAfterUpload true, if the changeset should be closed after the upload
      * @throws IllegalArgumentException thrown, if layer is null
      * @throws IllegalArgumentException thrown if strategy is null
      */
-    public UploadLayerTask(UploadStrategySpecification strategy, OsmDataLayer layer, ProgressMonitor monitor, Changeset changeset, boolean closeChangesetAfterUpload) {
+    public UploadLayerTask(UploadStrategySpecification strategy, OsmDataLayer layer, ProgressMonitor monitor, Changeset changeset) {
         if (layer == null)
             throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer"));
@@ -69 +67 @@
         this.changeset = changeset;
         this.strategy = strategy;
-        this.closeChangesetAfterUpload = closeChangesetAfterUpload;
         processedPrimitives = new HashSet<OsmPrimitive>();
     }
@@ -134 +131 @@
                 }
             }
-            if (closeChangesetAfterUpload) {
+            if (strategy.isCloseChangesetAfterUpload()) {
                 if (changeset != null && changeset.getId() > 0) {
                     OsmApi.getOsmApi().closeChangeset(changeset, monitor.createSubTaskMonitor(0, false));

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

@@ -9 +9 @@
 import java.awt.GridBagLayout;
 import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -23 +27 @@
 import javax.swing.JTextField;
 import javax.swing.UIManager;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
 import org.openstreetmap.josm.Main;
-
-public class UploadStrategySelectionPanel extends JPanel {
+import org.openstreetmap.josm.gui.JMultilineLabel;
+import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * UploadStrategySelectionPanel is a panel for selecting an upload strategy.
+ * 
+ * Clients can listen for property change events for the property
+ * {@see #UPLOAD_STRATEGY_SPECIFICATION_PROP}.
+ */
+public class UploadStrategySelectionPanel extends JPanel implements PropertyChangeListener {
+
+    /**
+     * The property for the upload strategy
+     */
+    public final static String UPLOAD_STRATEGY_SPECIFICATION_PROP =
+        UploadStrategySelectionPanel.class.getName() + ".uploadStrategySpecification";
+
     private static final Color BG_COLOR_ERROR = new Color(255,224,224);
 
     private ButtonGroup bgStrategies;
+    private ButtonGroup bgMultiChangesetPolicies;
     private Map<UploadStrategy, JRadioButton> rbStrategy;
     private Map<UploadStrategy, JLabel> lblNumRequests;
+    private Map<UploadStrategy, JMultilineLabel> lblStrategies;
     private JTextField tfChunkSize;
+    private JPanel pnlMultiChangesetPolicyPanel;
+    private JRadioButton rbFillOneChangeset;
+    private JRadioButton rbUseMultipleChangesets;
+    private JMultilineLabel lblMultiChangesetPoliciesHeader;
 
     private long numUploadedObjects = 0;
@@ -44 +68 @@
     }
 
-    protected void build() {
-        setLayout(new GridBagLayout());
+    protected JPanel buildUploadStrategyPanel() {
+        JPanel pnl = new JPanel();
+        pnl.setLayout(new GridBagLayout());
         bgStrategies = new ButtonGroup();
         rbStrategy = new HashMap<UploadStrategy, JRadioButton>();
+        lblStrategies = new HashMap<UploadStrategy, JMultilineLabel>();
         lblNumRequests = new HashMap<UploadStrategy, JLabel>();
         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));
         }
@@ -59 +86 @@
         gc.gridx = 0;
         gc.gridy = 0;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        gc.insets = new Insets(0,5,0,5);
+        gc.weightx = 1.0;
+        gc.weighty = 0.0;
+        gc.gridwidth = 4;
+        gc.insets = new Insets(0,0,3,0);
         gc.anchor = GridBagConstraints.FIRST_LINE_START;
-        add(rbStrategy.get(UploadStrategy.SINGLE_REQUEST_STRATEGY), gc);
-        gc.gridx = 1;
-        gc.gridy = 0;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        gc.gridwidth = 2;
-        add(new JLabel(tr("Upload data in one request")), gc);
-        gc.gridx = 3;
-        gc.gridy = 0;
-        gc.weightx = 1.0;
-        gc.weighty = 0.0;
-        gc.gridwidth = 1;
-        add(lblNumRequests.get(UploadStrategy.SINGLE_REQUEST_STRATEGY), gc);
-
-        // -- chunked dataset strategy
+        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;
-        add(rbStrategy.get(UploadStrategy.CHUNKED_DATASET_STRATEGY), gc);
+        gc.gridwidth = 1;
+        gc.anchor = GridBagConstraints.FIRST_LINE_START;
+        pnl.add(rbStrategy.get(UploadStrategy.SINGLE_REQUEST_STRATEGY), gc);
         gc.gridx = 1;
         gc.gridy = 1;
         gc.weightx = 0.0;
         gc.weighty = 0.0;
-        gc.gridwidth = 1;
-        add(new JLabel(tr("Upload data in chunks of objects. Chunk size: ")), gc);
-        gc.gridx = 2;
-        gc.gridy = 1;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        gc.gridwidth = 1;
-        add(tfChunkSize = new JTextField(4), gc);
+        gc.gridwidth = 2;
+        JLabel 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;
@@ -100 +114 @@
         gc.weighty = 0.0;
         gc.gridwidth = 1;
-        add(lblNumRequests.get(UploadStrategy.CHUNKED_DATASET_STRATEGY), gc);
+        pnl.add(lblNumRequests.get(UploadStrategy.SINGLE_REQUEST_STRATEGY), gc);
+
+        // -- chunked dataset strategy
+        gc.gridx = 0;
+        gc.gridy = 2;
+        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 = 0.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);
+        gc.gridx = 2;
+        gc.gridy = 2;
+        gc.weightx = 0.0;
+        gc.weighty = 0.0;
+        gc.gridwidth = 1;
+        pnl.add(tfChunkSize = new JTextField(4), gc);
+        gc.gridx = 3;
+        gc.gridy = 2;
+        gc.weightx = 1.0;
+        gc.weighty = 0.0;
+        gc.gridwidth = 1;
+        pnl.add(lblNumRequests.get(UploadStrategy.CHUNKED_DATASET_STRATEGY), gc);
 
         // -- single request strategy
         gc.gridx = 0;
-        gc.gridy = 2;
-        gc.weightx = 0.0;
-        gc.weighty = 0.0;
-        add(rbStrategy.get(UploadStrategy.INDIVIDUAL_OBJECTS_STRATEGY), gc);
+        gc.gridy = 3;
+        gc.weightx = 0.0;
+        gc.weighty = 0.0;
+        pnl.add(rbStrategy.get(UploadStrategy.INDIVIDUAL_OBJECTS_STRATEGY), gc);
         gc.gridx = 1;
-        gc.gridy = 2;
+        gc.gridy = 3;
         gc.weightx = 0.0;
         gc.weighty = 0.0;
         gc.gridwidth = 2;
-        add(new JLabel(tr("Upload each object individually")), gc);
+        lbl = lblStrategies.get(UploadStrategy.INDIVIDUAL_OBJECTS_STRATEGY);
+        lbl.setText(tr("Upload each object individually"));
+        pnl.add(lbl, gc);
         gc.gridx = 3;
-        gc.gridy = 2;
-        gc.weightx = 1.0;
-        gc.weighty = 0.0;
-        gc.gridwidth = 1;
-        add(lblNumRequests.get(UploadStrategy.INDIVIDUAL_OBJECTS_STRATEGY), gc);
-
+        gc.gridy = 3;
+        gc.weightx = 1.0;
+        gc.weighty = 0.0;
+        gc.gridwidth = 1;
+        pnl.add(lblNumRequests.get(UploadStrategy.INDIVIDUAL_OBJECTS_STRATEGY), gc);
 
         tfChunkSize.addFocusListener(new TextFieldFocusHandler());
         tfChunkSize.getDocument().addDocumentListener(new ChunkSizeInputVerifier());
+
         StrategyChangeListener strategyChangeListener = new StrategyChangeListener();
+        tfChunkSize.addFocusListener(strategyChangeListener);
+        tfChunkSize.addActionListener(strategyChangeListener);
         for(UploadStrategy strategy: UploadStrategy.values()) {
-            rbStrategy.get(strategy).addChangeListener(strategyChangeListener);
-        }
-
+            rbStrategy.get(strategy).addItemListener(strategyChangeListener);
+        }
+
+        return pnl;
+    }
+
+    protected JPanel buildMultiChangesetPolicyPanel() {
+        pnlMultiChangesetPolicyPanel = new JPanel();
+        pnlMultiChangesetPolicyPanel.setLayout(new GridBagLayout());
+        GridBagConstraints gc = new GridBagConstraints();
+        gc.gridx = 0;
+        gc.gridy = 0;
+        gc.fill = GridBagConstraints.HORIZONTAL;
+        gc.anchor = GridBagConstraints.FIRST_LINE_START;
+        gc.weightx = 1.0;
+        pnlMultiChangesetPolicyPanel.add(lblMultiChangesetPoliciesHeader = new JMultilineLabel(tr("<html>There are <strong>multiple changesets</strong> necessary in order to upload {0} objects. What policy shall be used?</html>", numUploadedObjects)), gc);
+        gc.gridy = 1;
+        pnlMultiChangesetPolicyPanel.add(rbFillOneChangeset = new JRadioButton(tr("Fill up one changeset and return to the Upload Dialog")),gc);
+        gc.gridy = 2;
+        pnlMultiChangesetPolicyPanel.add(rbUseMultipleChangesets = new JRadioButton(tr("Open and use as many new changesets as necessary")),gc);
+
+        bgMultiChangesetPolicies = new ButtonGroup();
+        bgMultiChangesetPolicies.add(rbFillOneChangeset);
+        bgMultiChangesetPolicies.add(rbUseMultipleChangesets);
+        return pnlMultiChangesetPolicyPanel;
+    }
+
+    protected void build() {
+        setLayout(new GridBagLayout());
+        GridBagConstraints gc = new GridBagConstraints();
+        gc.gridx = 0;
+        gc.gridy = 0;
+        gc.fill = GridBagConstraints.HORIZONTAL;
+        gc.weightx = 1.0;
+        gc.weighty = 0.0;
+        gc.anchor = GridBagConstraints.NORTHWEST;
+        gc.insets = new Insets(3,3,3,3);
+
+        add(buildUploadStrategyPanel(), gc);
+        gc.gridy = 1;
+        add(buildMultiChangesetPolicyPanel(), gc);
+
+        // consume remaining space
+        gc.gridy = 2;
+        gc.fill = GridBagConstraints.BOTH;
+        gc.weightx = 1.0;
+        gc.weighty = 1.0;
+        add(new JPanel(), gc);
+
+        int maxChunkSize = OsmApi.getOsmApi().getCapabilities().getMaxChangsetSize();
+        pnlMultiChangesetPolicyPanel.setVisible(
+                maxChunkSize > 0 && numUploadedObjects > maxChunkSize
+        );
     }
 
@@ -139 +234 @@
         if (strategy == null) return;
         rbStrategy.get(strategy.getStrategy()).setSelected(true);
+        tfChunkSize.setEnabled(strategy.equals(UploadStrategy.CHUNKED_DATASET_STRATEGY));
         if (strategy.getStrategy().equals(UploadStrategy.CHUNKED_DATASET_STRATEGY)) {
-            tfChunkSize.setEnabled(strategy.equals(UploadStrategy.CHUNKED_DATASET_STRATEGY));
             if (strategy.getChunkSize() != UploadStrategySpecification.UNSPECIFIED_CHUNK_SIZE) {
                 tfChunkSize.setText(Integer.toString(strategy.getChunkSize()));
@@ -152 +247 @@
         UploadStrategy strategy = getUploadStrategy();
         int chunkSize = getChunkSize();
+        UploadStrategySpecification spec = new UploadStrategySpecification();
         switch(strategy) {
-        case INDIVIDUAL_OBJECTS_STRATEGY: return UploadStrategySpecification.createIndividualObjectStrategy();
-        case SINGLE_REQUEST_STRATEGY: return UploadStrategySpecification.createSingleRequestUploadStrategy();
-        case CHUNKED_DATASET_STRATEGY: return UploadStrategySpecification.createChunkedUploadStrategy(chunkSize);
-        }
-        // should not happen
-        return null;
+        case INDIVIDUAL_OBJECTS_STRATEGY:
+            spec.setStrategy(strategy);
+            break;
+        case SINGLE_REQUEST_STRATEGY:
+            spec.setStrategy(strategy);
+            break;
+        case CHUNKED_DATASET_STRATEGY:
+            spec.setStrategy(strategy).setChunkSize(chunkSize);
+            break;
+        }
+        if(pnlMultiChangesetPolicyPanel.isVisible()) {
+            if (rbFillOneChangeset.isSelected()) {
+                spec.setPolicy(MaxChangesetSizeExceededPolicy.FILL_ONE_CHANGESET_AND_RETURN_TO_UPLOAD_DIALOG);
+            } else if (rbUseMultipleChangesets.isSelected()) {
+                spec.setPolicy(MaxChangesetSizeExceededPolicy.AUTOMATICALLY_OPEN_NEW_CHANGESETS);
+            } else {
+                spec.setPolicy(null); // unknown policy
+            }
+        } else {
+            spec.setPolicy(null);
+        }
+        return spec;
     }
 
@@ -171 +283 @@
         return strategy;
     }
-
 
     protected int getChunkSize() {
@@ -191 +302 @@
     }
 
-    public void saveToPreferences() {
+    public void rememberUserInput() {
         UploadStrategy strategy = getUploadStrategy();
         UploadStrategy.saveToPreferences(strategy);
@@ -204 +315 @@
 
     protected void updateNumRequestsLabels() {
+        int maxChunkSize = OsmApi.getOsmApi().getCapabilities().getMaxChangsetSize();
+        if (maxChunkSize > 0 && numUploadedObjects > maxChunkSize) {
+            rbStrategy.get(UploadStrategy.SINGLE_REQUEST_STRATEGY).setEnabled(false);
+            JLabel lbl = lblStrategies.get(UploadStrategy.SINGLE_REQUEST_STRATEGY);
+            lbl.setIcon(ImageProvider.get("warning-small.png"));
+            lbl.setText(tr("Upload in one request not possible (too many objects to upload)"));
+            lbl.setToolTipText(tr("<html>Can''t upload {0} objects in one request because the<br>"
+                    + "max. changeset size {1} on server ''{2}'' is exceeded.</html>",
+                    numUploadedObjects,
+                    maxChunkSize,
+                    OsmApi.getOsmApi().getBaseUrl()
+            )
+            );
+            rbStrategy.get(UploadStrategy.CHUNKED_DATASET_STRATEGY).setSelected(true);
+            lblNumRequests.get(UploadStrategy.SINGLE_REQUEST_STRATEGY).setVisible(false);
+
+            lblMultiChangesetPoliciesHeader.setText(tr("<html>There are <strong>multiple changesets</strong> necessary in order to upload {0} objects. What policy shall be used?</html>", numUploadedObjects));
+            if (!rbFillOneChangeset.isSelected() && ! rbUseMultipleChangesets.isSelected()) {
+                rbUseMultipleChangesets.setSelected(true);
+            }
+            pnlMultiChangesetPolicyPanel.setVisible(true);
+
+        } else {
+            rbStrategy.get(UploadStrategy.SINGLE_REQUEST_STRATEGY).setEnabled(true);
+            JLabel lbl = lblStrategies.get(UploadStrategy.SINGLE_REQUEST_STRATEGY);
+            lbl.setText(tr("Upload data in one request"));
+            lbl.setIcon(null);
+            lbl.setToolTipText("");
+            lblNumRequests.get(UploadStrategy.SINGLE_REQUEST_STRATEGY).setVisible(true);
+
+            pnlMultiChangesetPolicyPanel.setVisible(false);
+        }
+
         lblNumRequests.get(UploadStrategy.SINGLE_REQUEST_STRATEGY).setText(tr("(1 request)"));
         if (numUploadedObjects == 0) {
@@ -229 +373 @@
     }
 
+    public void propertyChange(PropertyChangeEvent evt) {
+        if (evt.getPropertyName().equals(UploadedObjectsSummaryPanel.NUM_OBJECTS_TO_UPLOAD_PROP)) {
+            setNumUploadedObjects((Integer)evt.getNewValue());
+        }
+    }
+
     class TextFieldFocusHandler implements FocusListener {
         public void focusGained(FocusEvent e) {
@@ -241 +391 @@
 
     class ChunkSizeInputVerifier implements DocumentListener, PropertyChangeListener {
-
         protected void setErrorFeedback(JTextField tf, String message) {
             tf.setBorder(BorderFactory.createLineBorder(Color.RED, 1));
@@ -257 +406 @@
             try {
                 int chunkSize = Integer.parseInt(tfChunkSize.getText().trim());
+                int maxChunkSize = OsmApi.getOsmApi().getCapabilities().getMaxChangsetSize();
                 if (chunkSize <= 0) {
                     setErrorFeedback(tfChunkSize, tr("Illegal chunk size <= 0. Please enter an integer > 1"));
+                } else if (maxChunkSize > 0 && chunkSize > maxChunkSize) {
+                    setErrorFeedback(tfChunkSize, tr("Chunk size {0} exceeds max. changeset size {1} for server ''{2}''", chunkSize, maxChunkSize, OsmApi.getOsmApi().getBaseUrl()));
                 } else {
                     clearErrorFeedback(tfChunkSize, tr("Please enter an integer > 1"));
+                }
+
+                if (maxChunkSize > 0 && chunkSize > maxChunkSize) {
+                    setErrorFeedback(tfChunkSize, tr("Chunk size {0} exceeds max. changeset size {1} for server ''{2}''", chunkSize, maxChunkSize, OsmApi.getOsmApi().getBaseUrl()));
                 }
             } catch(NumberFormatException e) {
@@ -291 +447 @@
     }
 
-    class StrategyChangeListener implements ChangeListener {
-        public void stateChanged(ChangeEvent e) {
+    class StrategyChangeListener implements ItemListener, FocusListener, ActionListener {
+
+        protected void notifyStrategy() {
+            firePropertyChange(UPLOAD_STRATEGY_SPECIFICATION_PROP, null, getUploadStrategySpecification());
+        }
+
+        public void itemStateChanged(ItemEvent e) {
             UploadStrategy strategy = getUploadStrategy();
             if (strategy == null) return;
@@ -303 +464 @@
                 tfChunkSize.setEnabled(false);
             }
+            notifyStrategy();
+        }
+
+        public void focusGained(FocusEvent arg0) {}
+
+        public void focusLost(FocusEvent arg0) {
+            notifyStrategy();
+        }
+
+        public void actionPerformed(ActionEvent arg0) {
+            notifyStrategy();
         }
     }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.io;
 
-public class UploadStrategySpecification {
+
+
+/**
+ * An UploadStrategySpecification consists of the parameter describing the strategy
+ * for uploading a collection of {@see OsmPrimitive}.
+ * 
+ * This includes:
+ * <ul>
+ * <li>a decision on which {@see UploadStrategy} to use</li>
+ * <li>the upload chunk size</li>
+ * <li>whether to close the changeset used after the upload</li>
+ * </ul>
+ *
+ *
+ */
+public class UploadStrategySpecification  {
+    /** indicates that the chunk size isn't specified */
     static public final int UNSPECIFIED_CHUNK_SIZE = -1;
-    static public UploadStrategySpecification createIndividualObjectStrategy() {
-        return new UploadStrategySpecification(UploadStrategy.INDIVIDUAL_OBJECTS_STRATEGY, 1);
-    }
-
-    static public UploadStrategySpecification createChunkedUploadStrategy(int chunkSize) {
-        return new UploadStrategySpecification(UploadStrategy.CHUNKED_DATASET_STRATEGY, chunkSize);
-    }
-
-    static public UploadStrategySpecification createSingleRequestUploadStrategy() {
-        return new UploadStrategySpecification(UploadStrategy.SINGLE_REQUEST_STRATEGY, UNSPECIFIED_CHUNK_SIZE);
-    }
 
     private UploadStrategy strategy;
     private int chunkSize;
+    private MaxChangesetSizeExceededPolicy policy;
+    private boolean closeChangesetAfterUpload;
 
-    private UploadStrategySpecification(UploadStrategy strategy, int chunkSize) {
-        this.strategy = strategy;
-        this.chunkSize = chunkSize;
+    /**
+     * Creates a new upload strategy with default values.
+     */
+    public UploadStrategySpecification() {
+        this.strategy = UploadStrategy.DEFAULT_UPLOAD_STRATEGY;
+        this.chunkSize = UNSPECIFIED_CHUNK_SIZE;
+        this.policy = null;
+        this.closeChangesetAfterUpload = true;
     }
 
+    /**
+     * Clones another upload strategy. If other is null,assumes default
+     * values.
+     * 
+     * @param other the other upload strategy
+     */
+    public UploadStrategySpecification(UploadStrategySpecification other) {
+        if (other == null) return;
+        this.strategy = other.strategy;
+        this.chunkSize = other.chunkSize;
+        this.policy = other.policy;
+        this.closeChangesetAfterUpload = other.closeChangesetAfterUpload;
+    }
+
+    /**
+     * Replies the upload strategy
+     * @return
+     */
     public UploadStrategy getStrategy() {
         return strategy;
     }
+
     public int getChunkSize() {
         return chunkSize;
     }
+
+    public static int getUnspecifiedChunkSize() {
+        return UNSPECIFIED_CHUNK_SIZE;
+    }
+
+    public MaxChangesetSizeExceededPolicy getPolicy() {
+        return policy;
+    }
+
+    public UploadStrategySpecification setStrategy(UploadStrategy strategy) {
+        this.strategy = strategy;
+        return this;
+    }
+
+    public UploadStrategySpecification setChunkSize(int chunkSize) {
+        this.chunkSize = chunkSize;
+        return this;
+    }
+
+    public UploadStrategySpecification setPolicy(MaxChangesetSizeExceededPolicy policy) {
+        this.policy = policy;
+        return this;
+    }
+
+    public UploadStrategySpecification setCloseChangesetAfterUpload(boolean closeChangesetAfterUpload) {
+        this.closeChangesetAfterUpload = closeChangesetAfterUpload;
+        return this;
+    }
+
+    public boolean isCloseChangesetAfterUpload() {
+        return closeChangesetAfterUpload;
+    }
+
+    public int getNumRequests(int numObjects) {
+        if (numObjects <=0) return 0;
+        switch(strategy) {
+        case INDIVIDUAL_OBJECTS_STRATEGY: return numObjects;
+        case SINGLE_REQUEST_STRATEGY: return 1;
+        case CHUNKED_DATASET_STRATEGY:
+            if (chunkSize == UNSPECIFIED_CHUNK_SIZE)
+                return 0;
+            else
+                return (int)Math.ceil((double)numObjects / (double)chunkSize);
+        }
+        // should not happen
+        return 0;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + chunkSize;
+        result = prime * result + (closeChangesetAfterUpload ? 1231 : 1237);
+        result = prime * result + ((policy == null) ? 0 : policy.hashCode());
+        result = prime * result + ((strategy == null) ? 0 : strategy.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        UploadStrategySpecification other = (UploadStrategySpecification) obj;
+        if (chunkSize != other.chunkSize)
+            return false;
+        if (closeChangesetAfterUpload != other.closeChangesetAfterUpload)
+            return false;
+        if (policy == null) {
+            if (other.policy != null)
+                return false;
+        } else if (!policy.equals(other.policy))
+            return false;
+        if (strategy == null) {
+            if (other.strategy != null)
+                return false;
+        } else if (!strategy.equals(other.strategy))
+            return false;
+        return true;
+    }
 }

trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java

@@ -155 +155 @@
             }
         }
-
         return super.stopCellEditing();
     }

trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java

@@ -219 +219 @@
         if (name == null) return;
         Iterator<TagModel> it = tags.iterator();
+        boolean changed = false;
         while(it.hasNext()) {
             TagModel tm = it.next();
             if (tm.getName().equals(name)) {
+                changed = true;
                 it.remove();
             }
         }
-        fireTableDataChanged();
-        setDirty(true);
+        if (changed) {
+            fireTableDataChanged();
+            setDirty(true);
+        }
     }
     /**
@@ -449 +453 @@
             setDirty(true);
         }
+        fireTableDataChanged();
     }
 
@@ -464 +469 @@
             setDirty(true);
         }
+        fireTableDataChanged();
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java

@@ -7 +7 @@
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
+import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.beans.PropertyChangeEvent;
@@ -69 +70 @@
         //
         AddAction addAction = new AddAction();
-        pnl.add(new JButton(addAction));
+        JButton btn;
+        pnl.add(btn = new JButton(addAction));
+        btn.setMargin(new Insets(0,0,0,0));
         tagTable.addPropertyChangeListener(addAction);
 
@@ -77 +80 @@
         tagTable.getSelectionModel().addListSelectionListener(deleteAction);
         tagTable.addPropertyChangeListener(deleteAction);
-        pnl.add(new JButton(deleteAction));
+        pnl.add(btn = new JButton(deleteAction));
+        btn.setMargin(new Insets(0,0,0,0));
         return pnl;
     }

trunk/src/org/openstreetmap/josm/io/Capabilities.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.HashMap;
@@ -71 +73 @@
     }
 
+    /**
+     * Replies the max number of objects in a changeset. -1 if either the capabilities
+     * don't include this parameter or if the parameter value is illegal (not a number,
+     * a negative number)
+     * 
+     * @return the max number of objects in a changeset
+     */
+    public int getMaxChangsetSize() {
+        String v = get("changesets", "maximum_elements");
+        if (v == null) return -1;
+        try {
+            int n = Integer.parseInt(v);
+            if (n <= 0) {
+                System.err.println(tr("Warning: illegal value of attribute '{0}'' of element ''{1}'' in server capabilities. Got ''{2}", "changesets", "maximum_elements", n ));
+                return -1;
+            }
+            return n;
+        } catch(NumberFormatException e) {
+            System.err.println(tr("Warning: illegal value of attribute '{0}'' of element ''{1}'' in server capabilities. Got ''{2}", "changesets", "maximum_elements", v ));
+            return -1;
+        }
+    }
 }

trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java

@@ -31 +31 @@
     final static public String ERROR_HEADER_PATTERN = "The changeset (\\d+) was closed at (.*)";
 
-    static enum Source {
+    public static enum Source {
         /**
          * The exception was thrown when a changeset was updated. This most likely means
@@ -114 +114 @@
 
     /**
+     * Creates the exception
+     * 
+     * @param changesetId the id if the closed changeset
+     * @param closedOn the date the changeset was closed on
+     * @param source the source for the exception
+     */
+    public ChangesetClosedException(long changesetId, Date closedOn, Source source) {
+        super("");
+        this.source = source == null ? Source.UNSPECIFIED : source;
+        this.changesetId = changesetId;
+        this.closedOn = closedOn;
+    }
+
+    /**
      * Replies the id of the changeset which was closed
      * 
@@ -139 +153 @@
         return source;
     }
+
+    public void setSource(Source source) {
+        this.source = source == null ? Source.UNSPECIFIED : source;
+    }
 }

trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

@@ -19 +19 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -76 +77 @@
 
     /**
-     * remembers an {@see OsmPrimitive}'s id and its type. The id will
+     * Remembers an {@see OsmPrimitive}'s id. The id will
      * later be fetched as part of a Multi Get request.
      *
-     * Ignore the id if it id <= 0.
+     * Ignore the id if it represents a new primitives.
      *
      * @param id  the id
-     * @param type  the type
-     */
-    protected void remember(long id, OsmPrimitiveType type) {
-        if (id <= 0) return;
-        if (type.equals(OsmPrimitiveType.NODE)) {
-            nodes.add(id);
-        } else if (type.equals(OsmPrimitiveType.WAY)) {
-            ways.add(id);
-        } if (type.equals(OsmPrimitiveType.RELATION)) {
-            relations.add(id);
+     */
+    protected void remember(PrimitiveId id) {
+        if (id.isNew()) return;
+        switch(id.getType()) {
+        case NODE: nodes.add(id.getUniqueId()); break;
+        case WAY: ways.add(id.getUniqueId()); break;
+        case RELATION: relations.add(id.getUniqueId()); break;
         }
     }
@@ -115 +113 @@
         if (primitive == null)
             throw new NoSuchElementException(tr("No primitive with id {0} in local dataset. Can't infer primitive type.", id));
-        remember(id, OsmPrimitiveType.from(primitive));
+        remember(primitive.getPrimitiveId());
         return;
     }
@@ -153 +151 @@
     public MultiFetchServerObjectReader append(Node node) {
         if (node == null) return this;
-        if (node.isNew()) return this;
-        remember(node.getId(), OsmPrimitiveType.NODE);
+        remember(node.getPrimitiveId());
         return this;
     }
@@ -170 +167 @@
         for (Node node: way.getNodes()) {
             if (!node.isNew()) {
-                remember(node.getId(), OsmPrimitiveType.NODE);
-            }
-        }
-        remember(way.getId(), OsmPrimitiveType.WAY);
+                remember(node.getPrimitiveId());
+            }
+        }
+        remember(way.getPrimitiveId());
         return this;
     }
@@ -187 +184 @@
         if (relation == null) return this;
         if (relation.isNew()) return this;
-        remember(relation.getId(), OsmPrimitiveType.RELATION);
+        remember(relation.getPrimitiveId());
         for (RelationMember member : relation.getMembers()) {
             if (OsmPrimitiveType.from(member.getMember()).equals(OsmPrimitiveType.RELATION)) {

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -80 +80 @@
         String serverUrl = Main.pref.get("osm-server.url", "http://api.openstreetmap.org/api");
         if (serverUrl == null)
-            throw new IllegalStateException(tr("Preference ''{0}'' missing. Can't initialize OsmApi.", "osm-server.url"));
+            throw new IllegalStateException(tr("Preference ''{0}'' missing. Can''t initialize OsmApi.", "osm-server.url"));
         return getOsmApi(serverUrl);
     }
@@ -342 +342 @@
                     monitor
             );
+        } catch(ChangesetClosedException e) {
+            e.setSource(ChangesetClosedException.Source.UPDATE_CHANGESET);
+            throw e;
         } catch(OsmApiException e) {
             if (e.getResponseCode() == HttpURLConnection.HTTP_CONFLICT && ChangesetClosedException.errorHeaderMatchesPattern(e.getErrorHeader()))

trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

@@ -149 +149 @@
             while(it.hasNext()) {
                 i++;
-                progressMonitor.setCustomText(tr("({0}/{1}) Uploading {2} objects...", i,numChunks,chunkSize));
                 if (canceled) return;
                 int j = 0;
@@ -158 +157 @@
                     chunk.add(it.next());
                 }
+                progressMonitor.setCustomText(tr("({0}/{1}) Uploading {2} objects...", i,numChunks,chunk.size()));
                 processed.addAll(api.uploadDiff(chunk, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false)));
             }