Changeset 6401 in josm for trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

Timestamp:

2013-11-22T22:19:33+01:00 (10 years ago)

Author:

simon04

Message:

see #6381 - Ask for source tag in changeset/upload

File:

• trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified) (2 diffs)

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

@@ -100 +100 @@
 
     /** the changeset comment model keeping the state of the changeset comment */
-    private ChangesetCommentModel changesetCommentModel;
+    private final ChangesetCommentModel changesetCommentModel = new ChangesetCommentModel();
+    private final ChangesetCommentModel changesetSourceModel = new ChangesetCommentModel();
 
     /**
@@ -131 +132 @@
         };
 
-        changesetCommentModel = new ChangesetCommentModel();
-
-        tpConfigPanels.add(pnlBasicUploadSettings = new BasicUploadSettingsPanel(changesetCommentModel));
+        tpConfigPanels.add(pnlBasicUploadSettings = new BasicUploadSettingsPanel(changesetCommentModel, changesetSourceModel));
         tpConfigPanels.setTitleAt(0, tr("Settings"));
         tpConfigPanels.setToolTipTextAt(0, tr("Decide how to upload the data and which changeset to use"));
 
-        tpConfigPanels.add(pnlTagSettings = new TagSettingsPanel(changesetCommentModel));
+        tpConfigPanels.add(pnlTagSettings = new TagSettingsPanel(changesetCommentModel, changesetSourceModel));
         tpConfigPanels.setTitleAt(1, tr("Tags of new changeset"));
         tpConfigPanels.setToolTipTextAt(1, tr("Apply tags to the changeset data is uploaded to"));