Changeset 3133 in josm for trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java

Timestamp:

14.03.2010 12:38:09 (2 years ago)

Author:

Gubaer

Message:

fixed #4371: Changeset comment reverts to previous when switching options

File:

• trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (modified) (9 diffs)

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

@@ -28 +28 @@
 import org.openstreetmap.josm.data.osm.ChangesetCache;
 import org.openstreetmap.josm.gui.JMultilineLabel;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -46 +47 @@
  * </ul>
  */
-public class ChangesetManagementPanel extends JPanel implements ListDataListener {
+public class ChangesetManagementPanel extends JPanel implements ListDataListener{
     public final static String SELECTED_CHANGESET_PROP = ChangesetManagementPanel.class.getName() + ".selectedChangeset";
     public final static String CLOSE_CHANGESET_AFTER_UPLOAD = ChangesetManagementPanel.class.getName() + ".closeChangesetAfterUpload";
@@ -58 +59 @@
     private JCheckBox cbCloseAfterUpload;
     private OpenChangesetComboBoxModel model;
+    private ChangesetCommentModel changesetCommentModel;
 
     /**
@@ -159 +161 @@
     }
 
-    public ChangesetManagementPanel() {
+    /**
+     * Creates a new panel
+     * 
+     * @param changesetCommentModel the changeset comment model. Must not be null.
+     * @throws IllegalArgumentException thrown if {@code changesetCommentModel} is null
+     */
+    public ChangesetManagementPanel(ChangesetCommentModel changesetCommentModel) {
+        CheckParameterUtil.ensureParameterNotNull(changesetCommentModel, "changesetCommentModel");
+        this.changesetCommentModel = changesetCommentModel;
         build();
         refreshGUI();
@@ -174 +184 @@
     }
 
+    /**
+     * Sets the changeset to be used in the next upload
+     * 
+     * @param cs the changeset
+     */
     public void setSelectedChangesetForNextUpload(Changeset cs) {
         int idx  = model.getIndexOf(cs);
@@ -204 +219 @@
     }
 
-    /**
-     * 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();
-    }
-
     /* ---------------------------------------------------------------------------- */
     /* Interface ListDataListener                                                   */
@@ -230 +235 @@
 
     /**
-     * Listens to changes in the selected changeset and accordingly fires property
+     * Listens to changes in the selected changeset and fires property
      * change events.
      *
@@ -237 +242 @@
         public void itemStateChanged(ItemEvent e) {
             Changeset cs = (Changeset)cbOpenChangesets.getSelectedItem();
+            if (cs == null) return;
             if (rbExisting.isSelected()) {
+                // create a clone of the selected changeset and make sure
+                // we keep the current changeset comment (see #4371)
+                cs = new Changeset(cs);
+                cs.put("comment", changesetCommentModel.getComment());
                 firePropertyChange(SELECTED_CHANGESET_PROP, null, cs);
-                if (cs == null) {
-                    rbUseNew.setSelected(true);
-                }
             }
         }
@@ -283 +290 @@
                 }
                 Changeset cs = (Changeset)cbOpenChangesets.getSelectedItem();
+                if (cs == null) return;
+                // create a clone of the selected changeset and make sure
+                // we keep the current changeset comment (see #4371)
+                cs = new Changeset(cs);
+                cs.put("comment", changesetCommentModel.getComment());
                 firePropertyChange(SELECTED_CHANGESET_PROP, null, cs);
             }