Changeset 2191 in josm for trunk

Timestamp:

2009-09-26T12:25:22+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3561: Changeset comment=* is incorrect in list of open changesets in upload dialog

Location:

trunk/src/org/openstreetmap/josm/gui/io

Files:

• CloseChangesetDialog.java (modified) (1 diff)
• UploadDialog.java (modified) (5 diffs)

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

@@ -100 +100 @@
         public CloseAction() {
             putValue(NAME, tr("Close changesets"));
-            //putValue(SMALL_ICON, ImageProvider.get("cancel"));
+            putValue(SMALL_ICON, ImageProvider.get("closechangeset"));
             putValue(SHORT_DESCRIPTION, tr("Close the selected open changesets"));
             refreshEnabledState();

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

@@ -857 +857 @@
         }
 
-        public void setUseNew() {
+        /**
+         * Sets whether a new changeset is to be used
+         * 
+         */
+        public void setUseNewChangeset() {
             rbUseNew.setSelected(true);
         }
 
-        public void setUseExisting() {
+        /**
+         * Sets whether an existing changeset is to be used
+         */
+        public void setUseExistingChangeset() {
             rbExisting.setSelected(true);
             if (cbOpenChangesets.getSelectedItem() == null && model.getSize() > 0) {
@@ -868 +875 @@
         }
 
+        /**
+         * Replies true if the selected changeset should be closed after the
+         * next upload
+         * 
+         * @return true if the selected changeset should be closed after the
+         * next upload
+         */
         public boolean isCloseAfterUpload() {
             return cbCloseAfterUpload.isSelected();
@@ -903 +917 @@
         class ChangesetListItemStateListener implements ItemListener {
             public void itemStateChanged(ItemEvent e) {
-
                 Changeset cs = (Changeset)cbOpenChangesets.getSelectedItem();
                 if (cs == null) {
@@ -919 +932 @@
                 } else {
                     southTabbedPane.setTitleAt(1, tr("Tags of changeset {0}", cs.getId()));
-                    cs.put("comment", cmt.getText());
-                    southTabbedPane.setTitleAt(1, tr("Tags of changeset {0}", cs.getId()));
                     if (cs.get("created_by") == null) {
                         cs.put("created_by", getDefaultCreatedBy());
@@ -949 +960 @@
             public CloseChangesetAction() {
                 putValue(NAME, tr("Close"));
+                putValue(SMALL_ICON, ImageProvider.get("closechangeset"));
                 putValue(SHORT_DESCRIPTION, tr("Close the currently selected open changeset"));
                 refreshEnabledState();