Changeset 2613 in josm for trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java

Timestamp:

2009-12-11T23:07:59+01:00 (14 years ago)

Author:

Gubaer

Message:

new: global in-memory cache for downloaded changesets
new: toggle dialog for changesets
new: downloading of changesets (currently without changeset content, will follow later)

File:

• trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (modified) (10 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.io;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.BorderLayout;
@@ -6 +8 @@
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -12 +17 @@
 import javax.swing.BorderFactory;
 import javax.swing.DefaultListModel;
+import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
@@ -18 +24 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.KeyStroke;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -26 +33 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.WindowGeometry;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -41 +46 @@
     /** the list model */
     private DefaultListModel model;
+
+    private SideButton btnCloseChangesets;
 
     protected JPanel buildTopPanel() {
@@ -66 +73 @@
         CloseAction closeAction = new CloseAction();
         lstOpenChangesets.addListSelectionListener(closeAction);
-        pnl.add(new SideButton(closeAction));
-        pnl.add(new SideButton(new CancelAction()));
+        pnl.add(btnCloseChangesets = new SideButton(closeAction));
+        btnCloseChangesets.setFocusable(true);
+        btnCloseChangesets.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,0), "enter");
+        btnCloseChangesets.getActionMap().put("enter",closeAction);
+
+        // -- cancel action
+        SideButton btn;
+        pnl.add(btn = new SideButton(new CancelAction()));
+        btn.setFocusable(true);
         return pnl;
     }
@@ -77 +91 @@
         getContentPane().add(buildCenterPanel(), BorderLayout.CENTER);
         getContentPane().add(buildSouthPanel(), BorderLayout.SOUTH);
+
+        getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE,0), "escape");
+        getRootPane().getActionMap().put("escape", new CancelAction());
+        addWindowListener(new WindowEventHandler());
     }
 
@@ -127 +145 @@
         }
 
-        public void actionPerformed(ActionEvent e) {
+        public void cancel() {
             setCanceled(true);
             setVisible(false);
         }
+
+        public void actionPerformed(ActionEvent e) {
+            cancel();
+        }
+    }
+
+    class WindowEventHandler extends WindowAdapter {
+
+        @Override
+        public void windowActivated(WindowEvent arg0) {
+            btnCloseChangesets.requestFocusInWindow();
+        }
+
+        @Override
+        public void windowClosing(WindowEvent arg0) {
+            new CancelAction().cancel();
+        }
+
     }
 
@@ -162 +198 @@
         for (Changeset cs: changesets) {
             model.addElement(cs);
+        }
+        if (!changesets.isEmpty()) {
+            lstOpenChangesets.getSelectionModel().setSelectionInterval(0, changesets.size()-1);
         }
     }