Changeset 25854 in osm for applications

Timestamp:

2011-04-16T18:56:13+02:00 (13 years ago)

Author:

zverik

Message:

finished

Location:

applications/editors/josm/plugins/dumbutils

Files:

• images/tagbuffer.png (added)
• src/dumbutils/DumbUtilsPlugin.java (modified) (2 diffs)
• src/dumbutils/ReplaceGeometryAction.java (modified) (1 diff)
• src/dumbutils/TagBufferAction.java (modified) (3 diffs)

applications/editors/josm/plugins/dumbutils/src/dumbutils/DumbUtilsPlugin.java

@@ -17 +17 @@
         Main.main.menu.toolsMenu.addSeparator();
         replaceGeometry = MainMenu.add(Main.main.menu.toolsMenu, new ReplaceGeometryAction());
-//        tagBuffer = MainMenu.add(Main.main.menu.toolsMenu, new TagBufferAction());
+        tagBuffer = MainMenu.add(Main.main.menu.toolsMenu, new TagBufferAction());
     }
 
@@ -24 +24 @@
         boolean enabled = newFrame != null;
         replaceGeometry.setEnabled(enabled);
-//        tagBuffer.setEnabled(enabled);
+        tagBuffer.setEnabled(enabled);
     }
 }

applications/editors/josm/plugins/dumbutils/src/dumbutils/ReplaceGeometryAction.java

@@ -53 +53 @@
         Command changeCommand = new ChangeCommand(way, result);
         Command deleteCommand = new DeleteCommand(geometry);
-        Main.main.undoRedo.add(new SequenceCommand(tr("Replace geometry of way {0}", way.getDisplayName(DefaultNameFormatter.getInstance()))));
+        Main.main.undoRedo.add(new SequenceCommand(
+                tr("Replace geometry of way {0}", way.getDisplayName(DefaultNameFormatter.getInstance())),
+                changeCommand, deleteCommand));
     }
 }

applications/editors/josm/plugins/dumbutils/src/dumbutils/TagBufferAction.java

@@ -1 +1 @@
 package dumbutils;
 
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.*;
 import java.util.*;
 import java.awt.event.KeyEvent;
@@ -17 +19 @@
     private static final String TITLE = "Paste remembered tags";
     private Map<String, String> tags = new HashMap<String, String>();
+    private Map<String, String> currentTags = new HashMap<String, String>();
+    private Set<OsmPrimitive> selectionBuf = new HashSet<OsmPrimitive>();
 
     public TagBufferAction() {
@@ -24 +28 @@
 
     public void actionPerformed( ActionEvent e ) {
-        for( OsmPrimitive p : getCurrentDataSet().getSelected() ) {
-            for( String key : tags.keySet() )
-                p.put(key, tags.get(key));
-            // todo: undoRedo
+        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
+        if( selection.isEmpty() )
+            return;
+
+        List<Command> commands = new ArrayList<Command>();
+        for( String key : tags.keySet() ) {
+            String value = tags.get(key);
+            boolean foundNew = false;
+            for( OsmPrimitive p : selection ) {
+                if( !p.hasKey(key) || !p.get(key).equals(value) ) {
+                    foundNew = true;
+                    break;
+                }
+            }
+            if( foundNew )
+                commands.add(new ChangePropertyCommand(selection, key, value));
+        }
+        
+        if( !commands.isEmpty() )
+            Main.main.undoRedo.add(new SequenceCommand(tr(TITLE), commands));
+    }
+
+    @Override
+    protected void updateEnabledState() {
+        if( getCurrentDataSet() == null ) {
+            setEnabled(false);
+            if( selectionBuf != null )
+                selectionBuf.clear();
+        }  else
+            updateEnabledState(getCurrentDataSet().getSelected());
+    }
+
+    @Override
+    protected void updateEnabledState( Collection<? extends OsmPrimitive> selection ) {
+        // selection changed => check if selection is completely different from before
+        boolean foundOld = false;
+        if( selection != null ) {
+            for( OsmPrimitive p : selectionBuf ) {
+                if( selection.contains(p) ) {
+                    foundOld = true;
+                    break;
+                }
+            }
+            selectionBuf.clear();
+            selectionBuf.addAll(selection);
+        } else {
+            foundOld = selectionBuf.isEmpty();
+            selectionBuf.clear();
+        }
+        if( !foundOld ) {
+            // selection has completely changed, remember tags
+            tags.clear();
+            tags.putAll(currentTags);
+        }
+        rememberSelectionTags();
+
+        setEnabled(selection != null && !selection.isEmpty() && !tags.isEmpty());
+    }
+
+    private void rememberSelectionTags() {
+        if( getCurrentDataSet() != null && !getCurrentDataSet().getSelected().isEmpty() ) {
+            currentTags.clear();
+            Set<String> bad = new HashSet<String>();
+            for( OsmPrimitive p : getCurrentDataSet().getSelected() ) {
+                if( currentTags.isEmpty() ) {
+                    for( String key : p.keySet() )
+                        currentTags.put(key, p.get(key));
+                } else {
+                    for( String key : p.keySet() )
+                        if( !currentTags.containsKey(key) || !currentTags.get(key).equals(p.get(key)) )
+                            bad.add(key);
+                    for( String key : currentTags.keySet() )
+                        if( !p.hasKey(key) )
+                            bad.add(key);
+                }
+            }
+            for( String key : bad )
+                currentTags.remove(key);
         }
     }
 }
-