Changeset 30 in josm for src/org/openstreetmap/josm/actions/OpenAction.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/OpenAction.java (modified) (5 diffs)

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

@@ -10 +10 @@
 import java.util.Collection;
 
-import javax.swing.AbstractAction;
 import javax.swing.Box;
 import javax.swing.JCheckBox;
@@ -24 +23 @@
 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.GBC;
-import org.openstreetmap.josm.gui.ImageProvider;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -41 +38 @@
  * @author imi
  */
-public class OpenAction extends AbstractAction {
+public class OpenAction extends JosmAction {
 
         /**
@@ -47 +44 @@
          */
         public OpenAction() {
-                super("Open", ImageProvider.get("open"));
-                putValue(ACCELERATOR_KEY, KeyStroke.getAWTKeyStroke(KeyEvent.VK_O, InputEvent.CTRL_DOWN_MASK));
-                putValue(MNEMONIC_KEY, KeyEvent.VK_O);
-                putValue(SHORT_DESCRIPTION, "Open a file.");
+                super("Open", "open", "Open a file.", null, KeyStroke.getAWTKeyStroke(KeyEvent.VK_O, InputEvent.CTRL_DOWN_MASK));
         }
 
@@ -96 +90 @@
                                 layer = new RawGpsDataLayer(data, filename.getName());
                         } else {
-                                DataSet dataSet = filename.getName().toLowerCase().endsWith("gpx") ?
+                                DataSet dataSet = filename.getName().toLowerCase().endsWith(".gpx") ?
                                                 new GpxReader(new FileReader(filename)).parse() :
                                                 new OsmReader(new FileReader(filename)).parse();
-                                Collection<OsmPrimitive> l = Main.main.ds.mergeFrom(dataSet);
-                                layer = new OsmDataLayer(l, filename.getName());
+                                layer = new OsmDataLayer(dataSet, filename.getName());
                         }