Changeset 2569 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2009-12-04T15:53:55+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3684: Add "chunked" upload mode
Removed support for API "0.5" when uploading (there are still 0.5-files around, but I'm not aware of any 0.5-servers)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• conflict/pair/ListMergeModel.java (modified) (2 diffs)
• conflict/pair/relation/RelationMemberListMergeModel.java (modified) (4 diffs)
• io/SaveLayersDialog.java (modified) (4 diffs)
• io/UploadDialog.java (modified) (15 diffs)
• io/UploadLayerTask.java (modified) (5 diffs)
• io/UploadStrategy.java (added)
• io/UploadStrategySelectionPanel.java (added)
• io/UploadStrategySpecification.java (added)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

@@ -15 +15 @@
 import java.util.HashMap;
 import java.util.Observable;
-import java.util.logging.Logger;
 
 import javax.swing.AbstractListModel;
@@ -120 +119 @@
         return entries.get(MERGED_ENTRIES);
     }
+
     protected ArrayList<T> getMyEntries() {
         return entries.get(MY_ENTRIES);
     }
+
     protected ArrayList<T> getTheirEntries() {
         return entries.get(THEIR_ENTRIES);

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.util.ArrayList;
 import java.util.logging.Logger;
 
@@ -16 +17 @@
  * The model for merging two lists of relation members
  *
- *
  */
 public class RelationMemberListMergeModel extends ListMergeModel<RelationMember>{
@@ -24 +24 @@
     @Override
     public boolean isEqualEntry(RelationMember e1, RelationMember e2) {
-        boolean ret = e1.getRole().equals(e2.getRole());
-        if (!e1.getMember().isNew() ) {
-            ret = ret && (e1.getMember().getId() == e2.getMember().getId());
-        } else {
-            ret = ret && (e1 == e2);
-        }
-        return ret;
+        return e1.equals(e2);
     }
 
@@ -119 +113 @@
         if (! isFrozen())
             throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Can't build resolution command"));
-        return new RelationMemberConflictResolverCommand(my, their, getMergedEntries());
+        ArrayList<RelationMember> entries = getMergedEntries();
+        return new RelationMemberConflictResolverCommand(my, their, entries);
     }
 }

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

@@ -298 +298 @@
         public void cancel() {
             switch(model.getMode()) {
-                case EDITING_DATA: cancelWhenInEditingModel(); break;
-                case UPLOADING_AND_SAVING: cancelSafeAndUploadTask(); break;
+            case EDITING_DATA: cancelWhenInEditingModel(); break;
+            case UPLOADING_AND_SAVING: cancelSafeAndUploadTask(); break;
             }
         }
@@ -333 +333 @@
                 Mode mode = (Mode)evt.getNewValue();
                 switch(mode) {
-                    case EDITING_DATA: setEnabled(true); break;
-                    case UPLOADING_AND_SAVING: setEnabled(false); break;
+                case EDITING_DATA: setEnabled(true); break;
+                case UPLOADING_AND_SAVING: setEnabled(false); break;
                 }
             }
@@ -367 +367 @@
                 SaveLayersModel.Mode mode = (SaveLayersModel.Mode)evt.getNewValue();
                 switch(mode) {
-                    case EDITING_DATA: setEnabled(true); break;
-                    case UPLOADING_AND_SAVING: setEnabled(false); break;
+                case EDITING_DATA: setEnabled(true); break;
+                case UPLOADING_AND_SAVING: setEnabled(false); break;
                 }
             }
@@ -408 +408 @@
 
                 currentTask = new UploadLayerTask(
+                        UploadDialog.getUploadDialog().getUploadStrategySpecification(),
                         layerInfo.getLayer(),
                         monitor,

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

@@ -2 +2 @@
 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;
@@ -50 +51 @@
 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;
@@ -58 +60 @@
 import org.openstreetmap.josm.gui.tagging.TagModel;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
-import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -192 +193 @@
                 JComponent.WHEN_IN_FOCUSED_WINDOW
         );
-        pnl.add(new SideButton(new ContextSensitiveHelpAction("/Dialogs/UploadDialog")));
-        HelpUtil.setHelpContext(getRootPane(),"/Dialogs/UploadDialog");
+        pnl.add(new SideButton(new ContextSensitiveHelpAction(ht("/Dialogs/UploadDialog"))));
+        HelpUtil.setHelpContext(getRootPane(),ht("/Dialogs/UploadDialog"));
         return pnl;
     }
@@ -293 +294 @@
             pnlLists.add(spDelete, gcList);
         }
+        pnlChangesetSelection.setNumUploadedObjects(add.size() + update.size() + delete.size());
     }
 
@@ -320 +322 @@
         cs.put("comment", getUploadComment());
         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 pnlChangesetSelection.getUploadStrategySpecification();
     }
 
@@ -487 +498 @@
 
         protected void warnIllegalUploadComment() {
-            JOptionPane.showMessageDialog(
+            HelpAwareOptionPane.showOptionDialog(
                     UploadDialog.this,
                     tr("Please enter a comment for this upload changeset (min. 3 characters)"),
                     tr("Illegal upload comment"),
-                    JOptionPane.ERROR_MESSAGE
+                    JOptionPane.ERROR_MESSAGE,
+                    ht("/Dialog/UploadDialog#IllegalUploadComment")
 
             );
         }
+
+        protected void warnIllegalChunkSize() {
+            HelpAwareOptionPane.showOptionDialog(
+                    UploadDialog.this,
+                    tr("Please enter a valid chunk size first"),
+                    tr("Illegal chunk size"),
+                    JOptionPane.ERROR_MESSAGE,
+                    ht("/Dialog/UploadDialog#IllegalChunkSize")
+            );
+        }
+
+
         public void actionPerformed(ActionEvent e) {
             if (getUploadComment().trim().length() < 3) {
@@ -502 +526 @@
                 return;
             }
+            UploadStrategySpecification strategy = getUploadStrategySpecification();
+            if (strategy.getStrategy().equals(UploadStrategy.CHUNKED_DATASET_STRATEGY)) {
+                if (strategy.getChunkSize() == UploadStrategySpecification.UNSPECIFIED_CHUNK_SIZE) {
+                    warnIllegalChunkSize();
+                    southTabbedPane.setSelectedIndex(0);
+                    pnlChangesetSelection.initEditingOfChunkSize();
+                    return;
+                }
+            }
             setCanceled(false);
             setVisible(false);
-
         }
     }
@@ -607 +639 @@
         private OpenChangesetModel model;
         private HistoryComboBox cmt;
-        private JCheckBox cbUseAtomicUpload;
+        private UploadStrategySelectionPanel pnlUploadStrategy;
 
         /**
@@ -615 +647 @@
          * @return the panel
          */
-        protected JPanel buildAtomicUploadControlPanel() {
-            JPanel pnl = new JPanel();
-            pnl.setLayout(new GridBagLayout());
-            GridBagConstraints gc = new GridBagConstraints();
-            gc.fill = GridBagConstraints.HORIZONTAL;
-            gc.weightx = 1.0;
-            gc.anchor = GridBagConstraints.FIRST_LINE_START;
-            pnl.add(cbUseAtomicUpload = new JCheckBox(tr("Upload all changes in one request")), gc);
-            cbUseAtomicUpload.setToolTipText(tr("Enable to upload all changes in one request, disable to use one request per changed primitive"));
-            boolean useAtomicUpload = Main.pref.getBoolean("osm-server.atomic-upload", true);
-            cbUseAtomicUpload.setSelected(useAtomicUpload);
-            cbUseAtomicUpload.setEnabled(OsmApi.getOsmApi().hasSupportForDiffUploads());
-            return pnl;
+        protected JPanel buildUploadStrategySelectionPanel() {
+            pnlUploadStrategy = new UploadStrategySelectionPanel();
+            pnlUploadStrategy.initFromPreferences();
+            return pnlUploadStrategy;
         }
 
@@ -678 +701 @@
             gc.weightx = 1.0;
             gc.anchor = GridBagConstraints.FIRST_LINE_START;
-            add(buildAtomicUploadControlPanel(), gc);
+            add(buildUploadStrategySelectionPanel(), gc);
 
             // -- changeset command
@@ -764 +787 @@
             cmt.addCurrentItemToHistory();
             Main.pref.putCollection(HISTORY_KEY, cmt.getHistory());
-            Main.pref.put("osm-server.atomic-upload", cbUseAtomicUpload.isSelected());
+            pnlUploadStrategy.saveToPreferences();
         }
 
@@ -819 +842 @@
         }
 
+        public void initEditingOfChunkSize() {
+            pnlUploadStrategy.initEditingOfChunkSize();
+        }
+
         protected void refreshGUI() {
             rbExisting.setEnabled(model.getSize() > 0);
@@ -848 +875 @@
                 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();
         }
 
@@ -932 +968 @@
         public boolean isCloseAfterUpload() {
             return cbCloseAfterUpload.isSelected();
+        }
+
+        public void setNumUploadedObjects(int numUploadedObjects) {
+            pnlUploadStrategy.setNumUploadedObjects(numUploadedObjects);
         }
 

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

@@ -44 +44 @@
     private Collection<OsmPrimitive> toUpload;
     private HashSet<OsmPrimitive> processedPrimitives;
+    private UploadStrategySpecification strategy;
 
     /**
-     *
+     * Creates the upload task
+     * 
+     * @param strategy the upload strategy specification
      * @param layer the layer. Must not be null.
      * @param monitor  a progress monitor. If monitor is null, uses {@see NullProgressMonitor#INSTANCE}
@@ -52 +55 @@
      * @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(OsmDataLayer layer, ProgressMonitor monitor, Changeset changeset, boolean closeChangesetAfterUpload) {
+    public UploadLayerTask(UploadStrategySpecification strategy, OsmDataLayer layer, ProgressMonitor monitor, Changeset changeset, boolean closeChangesetAfterUpload) {
         if (layer == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", layer));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer"));
+        if (strategy == null)
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "strategy"));
         if (monitor == null) {
             monitor = NullProgressMonitor.INSTANCE;
@@ -62 +68 @@
         this.monitor = monitor;
         this.changeset = changeset;
+        this.strategy = strategy;
         this.closeChangesetAfterUpload = closeChangesetAfterUpload;
         processedPrimitives = new HashSet<OsmPrimitive>();
@@ -103 +110 @@
     @Override
     public void run() {
-        monitor.subTask(tr("Preparing primitives to upload ..."));
+        monitor.indeterminateSubTask(tr("Preparing primitives to upload ..."));
         APIDataSet ds = new APIDataSet(layer.data);
         try {
@@ -120 +127 @@
                     ProgressMonitor m = monitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
                     if (isCancelled()) return;
-                    writer.uploadOsm(layer.data.getVersion(), toUpload, changeset, m);
+                    writer.uploadOsm(strategy, toUpload, changeset, m);
                     processedPrimitives.addAll(writer.getProcessedPrimitives());
                     break;