Changeset 1814 in josm for trunk/src/org/openstreetmap/josm/actions/CopyAction.java

Timestamp:

2009-07-19T19:04:49+02:00 (15 years ago)

Author:

Gubaer

Message:

removed dependencies to Main.ds, removed Main.ds
removed AddVisitor, NameVisitor, DeleteVisitor - unnecessary double dispatching for these simple cases

File:

• trunk/src/org/openstreetmap/josm/actions/CopyAction.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/actions/CopyAction.java

@@ -45 +45 @@
 
     public void actionPerformed(ActionEvent e) {
-        if(noSelection()) return;
+        if(isEmptySelection()) return;
 
         Main.pasteBuffer = copyData();
-        Main.pasteSource = Main.main.createOrGetEditLayer();
+        Main.pasteSource = getEditLayer();
         Main.main.menu.paste.setEnabled(true); /* now we have a paste buffer we can make paste available */
 
@@ -56 +56 @@
     }
 
-    public static DataSet copyData() {
+    public DataSet copyData() {
         /* New pasteBuffer - will be assigned to the global one at the end */
         final DataSet pasteBuffer = new DataSet();
@@ -62 +62 @@
         /* temporarily maps old nodes to new so we can do a true deep copy */
 
-        if(noSelection()) return pasteBuffer;
+        if(isEmptySelection()) return pasteBuffer;
 
         /* scan the selected objects, mapping them to copies; when copying a way or relation,
@@ -71 +71 @@
                  * or a way and a node in that way is selected, we'll see it twice, once via the
                  * way and once directly; and so on. */
-                if (map.containsKey(n)) { return; }
+                if (map.containsKey(n))
+                    return;
                 Node nnew = new Node(n);
                 map.put(n, nnew);
@@ -78 +79 @@
             public void visit(Way w) {
                 /* check if already in pasteBuffer - could have come from a relation, and directly etc. */
-                if (map.containsKey(w)) { return; }
+                if (map.containsKey(w))
+                    return;
                 Way wnew = new Way();
                 wnew.cloneFrom(w);
@@ -93 +95 @@
             }
             public void visit(Relation e) {
-                if (map.containsKey(e)) { return; }
+                if (map.containsKey(e))
+                    return;
                 Relation enew = new Relation(e);
                 List<RelationMember> members = new ArrayList<RelationMember>();
@@ -108 +111 @@
             }
             public void visitAll() {
-                for (OsmPrimitive osm : Main.ds.getSelected())
+                for (OsmPrimitive osm : getCurrentDataSet().getSelected()) {
                     osm.visit(this);
+                }
 
                 // Used internally only (in PasteTagsAction), therefore no need to translate these
-                if(Main.ds.getSelectedNodes().size() > 0)
+                if(getCurrentDataSet().getSelectedNodes().size() > 0) {
                     pasteBuffer.dataSources.add(new DataSource(null, "Copied Nodes"));
-                if(Main.ds.getSelectedWays().size() > 0)
+                }
+                if(getCurrentDataSet().getSelectedWays().size() > 0) {
                     pasteBuffer.dataSources.add(new DataSource(null, "Copied Ways"));
-                if(Main.ds.getSelectedRelations().size() > 0)
+                }
+                if(getCurrentDataSet().getSelectedRelations().size() > 0) {
                     pasteBuffer.dataSources.add(new DataSource(null, "Copied Relations"));
+                }
             }
         }.visitAll();
@@ -128 +135 @@
     }
 
-    private static boolean noSelection() {
-        Collection<OsmPrimitive> sel = Main.ds.getSelected();
+    private boolean isEmptySelection() {
+        Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
         if (sel.isEmpty()) {
-            JOptionPane.showMessageDialog(Main.parent,
-                    tr("Please select something to copy."));
+            JOptionPane.showMessageDialog(
+                    Main.parent,
+                    tr("Please select something to copy.")
+            );
             return true;
         }