Changeset 30 in josm for src/org/openstreetmap/josm/actions/OpenOsmServerAction.java

Timestamp:

2005-12-03T14:14:35+01:00 (20 years ago)

Author:

imi

Message:

• Removed edit layer, combine action, save gpx (integrated in normal save)
• Simplified and unified shortkeys
• many small code simplifications
• added undo
• broken checkin!

File:

• src/org/openstreetmap/josm/actions/OpenOsmServerAction.java (modified) (6 diffs)

src/org/openstreetmap/josm/actions/OpenOsmServerAction.java

@@ -5 +5 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.io.IOException;
-import java.util.Collection;
 
-import javax.swing.AbstractAction;
 import javax.swing.DefaultListModel;
 import javax.swing.JButton;
@@ -18 +17 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
+import javax.swing.KeyStroke;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -25 +25 @@
 import org.openstreetmap.josm.data.GeoPoint;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.BookmarkList;
 import org.openstreetmap.josm.gui.GBC;
-import org.openstreetmap.josm.gui.ImageProvider;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
@@ -45 +43 @@
  * @author imi
  */
-public class OpenOsmServerAction extends AbstractAction {
+public class OpenOsmServerAction extends JosmAction {
 
         JTextField[] latlon = new JTextField[]{
@@ -55 +53 @@
 
         public OpenOsmServerAction() {
-                super("Connect to OSM", ImageProvider.get("connectosm"));
-                putValue(MNEMONIC_KEY, KeyEvent.VK_C);
-                putValue(SHORT_DESCRIPTION, "Open a connection to the OSM server.");
+                super("Connect to OSM", "connectosm", "Open a connection to the OSM server.", KeyEvent.VK_C, 
+                                KeyStroke.getAWTKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK));
         }
 
@@ -163 +160 @@
                                         JOptionPane.showMessageDialog(Main.main, "No data imported.");
                                 
-                                Collection<OsmPrimitive> data = Main.main.ds.mergeFrom(dataSet);
-                                layer = new OsmDataLayer(data, name);
+                                layer = new OsmDataLayer(dataSet, name);
                         }