Changeset 404 in josm

Timestamp:

2007-10-19T01:45:47+02:00 (17 years ago)

Author:

framm

Message:

 

Location:

trunk

Files:

• images/copy.png (added)
• images/duplicate.png (added)
• images/paste.png (added)
• src/org/openstreetmap/josm/Main.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/CopyAction.java (added)
• src/org/openstreetmap/josm/actions/DuplicateAction.java (added)
• src/org/openstreetmap/josm/actions/PasteAction.java (added)
• src/org/openstreetmap/josm/gui/MainMenu.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -83 +83 @@
         public static DataSet ds = new DataSet();
         /**
+         * The global paste buffer.
+         */
+        public static DataSet pasteBuffer = new DataSet();
+        /**
          * The projection method used.
          */

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.BorderLayout;
-import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.Vector;
 
 import javax.swing.Action;
-import javax.swing.DefaultComboBoxModel;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
-import javax.swing.JPanel;
 
 import org.openstreetmap.josm.actions.AboutAction;
@@ -22 +17 @@
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.CombineWayAction;
+import org.openstreetmap.josm.actions.CopyAction;
 import org.openstreetmap.josm.actions.DownloadAction;
+import org.openstreetmap.josm.actions.DuplicateAction;
 import org.openstreetmap.josm.actions.ExitAction;
 import org.openstreetmap.josm.actions.GpxExportAction;
@@ -28 +25 @@
 import org.openstreetmap.josm.actions.NewAction;
 import org.openstreetmap.josm.actions.OpenAction;
+import org.openstreetmap.josm.actions.PasteAction;
 import org.openstreetmap.josm.actions.PreferencesAction;
 import org.openstreetmap.josm.actions.RedoAction;
@@ -40 +38 @@
 import org.openstreetmap.josm.actions.search.SearchAction;
 import org.openstreetmap.josm.data.DataSetChecker;
-import org.openstreetmap.josm.gui.preferences.TaggingPresetPreference;
-import org.openstreetmap.josm.gui.tagging.ForwardActionListener;
-import org.openstreetmap.josm.gui.tagging.TaggingCellRenderer;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset;
-import org.openstreetmap.josm.tools.GBC;
 
 /**
@@ -58 +51 @@
         public final UndoAction undo = new UndoAction();
         public final RedoAction redo = new RedoAction();
+        public final Action copy = new CopyAction();
+        public final Action paste = new PasteAction();
+        public final Action duplicate = new DuplicateAction(); 
         public final Action selectAll = new SelectAllAction();
         public final Action unselectAll = new UnselectAllAction();
@@ -104 +100 @@
                 editMenu.add(undo);
                 editMenu.add(redo);
+                editMenu.addSeparator();
+                editMenu.add(copy);
+                editMenu.add(paste);
+                editMenu.add(duplicate);
+                editMenu.addSeparator();
+                editMenu.add(selectAll);
+                
                 editMenu.addSeparator();
                 editMenu.add(selectAll);