Changeset 3133 in josm for trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.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/TagSettingsPanel.java (modified) (5 diffs)

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

@@ -3 +3 @@
 
 import java.awt.BorderLayout;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.util.Map;
+import java.util.Observable;
+import java.util.Observer;
 
 import javax.swing.JPanel;
@@ -15 +15 @@
 import org.openstreetmap.josm.gui.tagging.TagEditorPanel;
 import org.openstreetmap.josm.gui.tagging.TagModel;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
-public class TagSettingsPanel extends JPanel implements PropertyChangeListener, TableModelListener {
-    static public final String UPLOAD_COMMENT_PROP = TagSettingsPanel.class.getName() + ".uploadComment";
+public class TagSettingsPanel extends JPanel implements TableModelListener {
 
     /** checkbox for selecting whether an atomic upload is to be used  */
     private TagEditorPanel pnlTagEditor;
+    /** the model for the changeset comment */
+    private ChangesetCommentModel changesetCommentModel;
+
 
     protected void build() {
@@ -27 +30 @@
     }
 
-    public TagSettingsPanel() {
+    /**
+     * Creates a new panel
+     * 
+     * @param changesetCommentModel the changeset comment model. Must not be null.
+     * @throws IllegalArgumentException thrown if {@code changesetCommentModel} is null
+     */
+    public TagSettingsPanel(ChangesetCommentModel changesetCommentModel) throws IllegalArgumentException{
+        CheckParameterUtil.ensureParameterNotNull(changesetCommentModel, "changesetCommentModel");
+        this.changesetCommentModel = changesetCommentModel;
+        this.changesetCommentModel.addObserver(new ChangesetCommentObserver());
         build();
         pnlTagEditor.getModel().addTableModelListener(this);
@@ -42 +54 @@
     }
 
-    public void setUploadComment(String comment) {
+    protected void setUploadComment(String comment) {
         if (comment == null) {
             comment = "";
@@ -111 +123 @@
 
     /* -------------------------------------------------------------------------- */
-    /* Interface PropertyChangeListener                                           */
-    /* -------------------------------------------------------------------------- */
-    public void propertyChange(PropertyChangeEvent evt) {
-        if (evt.getPropertyName().equals(ChangesetManagementPanel.SELECTED_CHANGESET_PROP)) {
-            Changeset cs = (Changeset)evt.getNewValue();
-            initFromChangeset(cs);
-        } else if (evt.getPropertyName().equals(BasicUploadSettingsPanel.UPLOAD_COMMENT_PROP)) {
-            String comment = (String)evt.getNewValue();
-            setUploadComment(comment);
-        }
-    }
-
-    /* -------------------------------------------------------------------------- */
     /* Interface TableChangeListener                                              */
     /* -------------------------------------------------------------------------- */
     public void tableChanged(TableModelEvent e) {
         String uploadComment = getUploadComment();
-        firePropertyChange(UPLOAD_COMMENT_PROP, null, uploadComment);
+        changesetCommentModel.setComment(uploadComment);
+    }
+
+    /**
+     * Observes the changeset comment model and keeps the tag editor in sync
+     * with the current changeset comment
+     *
+     */
+    class ChangesetCommentObserver implements Observer {
+        public void update(Observable o, Object arg) {
+            if (!(o instanceof ChangesetCommentModel)) return;
+            String newValue = (String)arg;
+            String oldValue = getUploadComment();
+            if (oldValue == null) {
+                oldValue = "";
+            }
+            if (!oldValue.equals(newValue)) {
+                setUploadComment((String)arg);
+            }
+        }
     }
 }