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

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

@@ -80 +80 @@
     /** the upload button */
     private JButton btnUpload;
-
     private boolean canceled = false;
+
+    /** the changeset comment model keeping the state of the changeset comment */
+    private ChangesetCommentModel changesetCommentModel;
 
     /**
@@ -113 +115 @@
         tpConfigPanels.add(new JPanel());
 
-        tpConfigPanels.setComponentAt(0, pnlBasicUploadSettings = new BasicUploadSettingsPanel());
+        changesetCommentModel = new ChangesetCommentModel();
+
+        tpConfigPanels.setComponentAt(0, pnlBasicUploadSettings = new BasicUploadSettingsPanel(changesetCommentModel));
         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.setComponentAt(1,pnlTagSettings = new TagSettingsPanel(changesetCommentModel));
         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.setComponentAt(2,pnlChangesetManagement = new ChangesetManagementPanel(changesetCommentModel));
         tpConfigPanels.setTitleAt(2, tr("Changesets"));
         tpConfigPanels.setToolTipTextAt(2, tr("Manage open changesets and select a changeset to upload to"));
@@ -175 +179 @@
         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
@@ -188 +186 @@
                 pnlBasicUploadSettings.getUploadParameterSummaryPanel()
         );
-        pnlChangesetManagement.addPropertyChangeListener(pnlTagSettings);
         pnlChangesetManagement.addPropertyChangeListener(this);
         pnlUploadedObjects.addPropertyChangeListener(
@@ -197 +194 @@
                 pnlBasicUploadSettings.getUploadParameterSummaryPanel()
         );
+
 
         // users can click on either of two links in the upload parameter
@@ -268 +266 @@
         pnlBasicUploadSettings.startUserInput();
         pnlTagSettings.startUserInput();
-        pnlTagSettings.setUploadComment(getUploadComment());
         pnlTagSettings.initFromChangeset(pnlChangesetManagement.getSelectedChangeset());
         pnlUploadStrategySelectionPanel.initFromPreferences();
@@ -312 +309 @@
      */
     protected String getUploadComment() {
-        return pnlBasicUploadSettings.getUploadComment();
+        return changesetCommentModel.getComment();
     }
 
@@ -385 +382 @@
                 warnIllegalUploadComment();
                 tpConfigPanels.setSelectedIndex(0);
-                pnlBasicUploadSettings.initEditingOfUploadComment(getUploadComment());
+                pnlBasicUploadSettings.initEditingOfUploadComment();
                 return;
             }
@@ -437 +434 @@
         public void windowActivated(WindowEvent arg0) {
             if (tpConfigPanels.getSelectedIndex() == 0) {
-                pnlBasicUploadSettings.initEditingOfUploadComment(getUploadComment());
+                pnlBasicUploadSettings.initEditingOfUploadComment();
             }
         }