Changeset 9493 in josm for trunk/src

Timestamp:

2016-01-16T21:35:52+01:00 (9 years ago)

Author:

Don-vip

Message:

reduce code duplication

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset

Files:

• ChangesetAware.java (added)
• ChangesetContentPanel.java (modified) (5 diffs)
• ChangesetDetailPanel.java (modified) (15 diffs)
• DownloadChangesetContentAction.java (added)

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java

@@ -59 +59 @@
  *
  */
-public class ChangesetContentPanel extends JPanel implements PropertyChangeListener {
+public class ChangesetContentPanel extends JPanel implements PropertyChangeListener, ChangesetAware {
 
     private ChangesetContentTableModel model;
@@ -74 +74 @@
         DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
         model = new ChangesetContentTableModel(selectionModel);
-        actDownloadContentAction = new DownloadChangesetContentAction();
-        actDownloadContentAction.initProperties(currentChangeset);
+        actDownloadContentAction = new DownloadChangesetContentAction(this);
+        actDownloadContentAction.initProperties();
         actShowHistory = new ShowHistoryAction();
         model.getSelectionModel().addListSelectionListener(actShowHistory);
@@ -158 +158 @@
             model.populate(cs.getContent());
         }
-        actDownloadContentAction.initProperties(cs);
+        actDownloadContentAction.initProperties();
         pnlHeader.setChangeset(cs);
     }
@@ -185 +185 @@
                 title, JOptionPane.WARNING_MESSAGE, helpTopic
         );
-    }
-
-    /**
-     * Downloads/Updates the content of the changeset
-     *
-     */
-    class DownloadChangesetContentAction extends AbstractAction {
-        DownloadChangesetContentAction() {
-            putValue(NAME, tr("Download content"));
-            putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON);
-            putValue(SHORT_DESCRIPTION, tr("Download the changeset content from the OSM server"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent evt) {
-            if (currentChangeset == null) return;
-            ChangesetContentDownloadTask task = new ChangesetContentDownloadTask(ChangesetContentPanel.this, currentChangeset.getId());
-            ChangesetCacheManager.getInstance().runDownloadTask(task);
-        }
-
-        public void initProperties(Changeset cs) {
-            if (cs == null) {
-                setEnabled(false);
-                return;
-            } else {
-                setEnabled(true);
-            }
-            if (cs.getContent() == null) {
-                putValue(NAME, tr("Download content"));
-                putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON);
-                putValue(SHORT_DESCRIPTION, tr("Download the changeset content from the OSM server"));
-            } else {
-                putValue(NAME, tr("Update content"));
-                putValue(SMALL_ICON, ChangesetCacheManager.UPDATE_CONTENT_ICON);
-                putValue(SHORT_DESCRIPTION, tr("Update the changeset content from the OSM server"));
-            }
-        }
     }
 
@@ -457 +420 @@
         }
     }
+
+    @Override
+    public Changeset getCurrentChangeset() {
+        return currentChangeset;
+    }
 }

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java

@@ -48 +48 @@
  *
  */
-public class ChangesetDetailPanel extends JPanel implements PropertyChangeListener {
+public class ChangesetDetailPanel extends JPanel implements PropertyChangeListener, ChangesetAware {
 
     private final JosmTextField tfID        = new JosmTextField(10);
@@ -57 +57 @@
     private final JosmTextField tfClosedOn  = new JosmTextField(20);
 
-    private final DownloadChangesetContentAction actDownloadChangesetContent = new DownloadChangesetContentAction();
+    private final DownloadChangesetContentAction actDownloadChangesetContent = new DownloadChangesetContentAction(this);
     private final UpdateChangesetAction          actUpdateChangesets         = new UpdateChangesetAction();
     private final RemoveFromCacheAction          actRemoveFromCache          = new RemoveFromCacheAction();
@@ -63 +63 @@
     private final ZoomInCurrentLayerAction       actZoomInCurrentLayerAction = new ZoomInCurrentLayerAction();
 
-    private transient Changeset current;
+    private transient Changeset currentChangeset;
 
     protected JPanel buildActionButtonPanel() {
@@ -73 +73 @@
         // -- remove from cache action
         tb.add(actRemoveFromCache);
-        actRemoveFromCache.initProperties(current);
+        actRemoveFromCache.initProperties(currentChangeset);
 
         // -- changeset update
         tb.add(actUpdateChangesets);
-        actUpdateChangesets.initProperties(current);
+        actUpdateChangesets.initProperties(currentChangeset);
 
         // -- changeset content download
         tb.add(actDownloadChangesetContent);
-        actDownloadChangesetContent.initProperties(current);
+        actDownloadChangesetContent.initProperties();
 
         tb.add(actSelectInCurrentLayer);
@@ -240 +240 @@
 
     protected void setCurrentChangeset(Changeset cs) {
-        current = cs;
+        currentChangeset = cs;
         if (cs == null) {
             clearView();
@@ -246 +246 @@
             updateView(cs);
         }
-        actDownloadChangesetContent.initProperties(current);
-        actUpdateChangesets.initProperties(current);
-        actRemoveFromCache.initProperties(current);
+        actDownloadChangesetContent.initProperties();
+        actUpdateChangesets.initProperties(currentChangeset);
+        actRemoveFromCache.initProperties(currentChangeset);
         actSelectInCurrentLayer.updateEnabledState();
         actZoomInCurrentLayerAction.updateEnabledState();
@@ -275 +275 @@
         @Override
         public void actionPerformed(ActionEvent evt) {
-            if (current == null)
-                return;
-            ChangesetCache.getInstance().remove(current);
+            if (currentChangeset == null)
+                return;
+            ChangesetCache.getInstance().remove(currentChangeset);
         }
 
         public void initProperties(Changeset cs) {
             setEnabled(cs != null);
-        }
-    }
-
-    /**
-     * Removes the selected changesets from the local changeset cache
-     *
-     */
-    class DownloadChangesetContentAction extends AbstractAction {
-        DownloadChangesetContentAction() {
-            putValue(NAME, tr("Download content"));
-            putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON);
-            putValue(SHORT_DESCRIPTION, tr("Download the changeset content from the OSM server"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent evt) {
-            if (current == null) return;
-            ChangesetContentDownloadTask task = new ChangesetContentDownloadTask(ChangesetDetailPanel.this, current.getId());
-            ChangesetCacheManager.getInstance().runDownloadTask(task);
-        }
-
-        public void initProperties(Changeset cs) {
-            if (cs == null) {
-                setEnabled(false);
-                return;
-            } else {
-                setEnabled(true);
-            }
-            if (cs.getContent() == null) {
-                putValue(NAME, tr("Download content"));
-                putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON);
-                putValue(SHORT_DESCRIPTION, tr("Download the changeset content from the OSM server"));
-            } else {
-                putValue(NAME, tr("Update content"));
-                putValue(SMALL_ICON, ChangesetCacheManager.UPDATE_CONTENT_ICON);
-                putValue(SHORT_DESCRIPTION, tr("Update the changeset content from the OSM server"));
-            }
         }
     }
@@ -335 +298 @@
         @Override
         public void actionPerformed(ActionEvent evt) {
-            if (current == null) return;
+            if (currentChangeset == null) return;
             Main.worker.submit(
                     new ChangesetHeaderDownloadTask(
                             ChangesetDetailPanel.this,
-                            Collections.singleton(current.getId())
+                            Collections.singleton(currentChangeset.getId())
                     )
             );
@@ -368 +331 @@
                     tr("<html>None of the objects in the content of changeset {0} is available in the current<br>"
                             + "edit layer ''{1}''.</html>",
-                            current.getId(),
+                            currentChangeset.getId(),
                             Main.main.getEditLayer().getName()
                     ),
@@ -385 +348 @@
             Set<OsmPrimitive> target = new HashSet<>();
             for (OsmPrimitive p: layer.data.allPrimitives()) {
-                if (p.isUsable() && p.getChangesetId() == current.getId()) {
+                if (p.isUsable() && p.getChangesetId() == currentChangeset.getId()) {
                     target.add(p);
                 }
@@ -401 +364 @@
                 return;
             }
-            setEnabled(current != null);
+            setEnabled(currentChangeset != null);
         }
 
@@ -429 +392 @@
                     tr("<html>None of the objects in the content of changeset {0} is available in the current<br>"
                             + "edit layer ''{1}''.</html>",
-                            current.getId(),
+                            currentChangeset.getId(),
                             Main.main.getEditLayer().getName()
                     ),
@@ -446 +409 @@
             Set<OsmPrimitive> target = new HashSet<>();
             for (OsmPrimitive p: layer.data.allPrimitives()) {
-                if (p.isUsable() && p.getChangesetId() == current.getId()) {
+                if (p.isUsable() && p.getChangesetId() == currentChangeset.getId()) {
                     target.add(p);
                 }
@@ -463 +426 @@
                 return;
             }
-            setEnabled(current != null);
+            setEnabled(currentChangeset != null);
         }
 
@@ -471 +434 @@
         }
     }
+
+    @Override
+    public Changeset getCurrentChangeset() {
+        return currentChangeset;
+    }
 }