Changeset 30389 in osm for applications/editors/josm/plugins

Timestamp:

2014-04-09T19:31:36+02:00 (11 years ago)

Author:

akks

Message:

[josm_utilsplugin2]: search parents:/children:; multitagger: select, sync

Location:

applications/editors/josm/plugins/utilsplugin2

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagDialog.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTaggerTableModel.java (modified) (6 diffs)
• src/org/openstreetmap/josm/plugins/utilsplugin2/search/ChildrenMatch.java (copied) (copied from applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/UsedInWaysMatch.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/utilsplugin2/search/ParentsMatch.java (copied) (copied from applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/UsedInWaysMatch.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/utilsplugin2/search/UsedInRelationsMatch.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/utilsplugin2/search/UsedInWaysMatch.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/utilsplugin2/search/UtilsSimpleMatchFactory.java (modified) (2 diffs)

applications/editors/josm/plugins/utilsplugin2/build.xml

@@ -3 +3 @@
 
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="[josm_utilsplugin2]: usedinways/usedinrealtions; multitagger: center on double-click"/>
+    <property name="commit.message" value="[josm_utilsplugin2]: search parents:/children:; multitagger: select, sync"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="6317"/>

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagDialog.java

@@ -30 +30 @@
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
-import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -40 +39 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.tagging.TagCellEditor;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
-import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.util.HighlightHelper;
 import org.openstreetmap.josm.gui.util.TableHelper;
@@ -88 +84 @@
         pnl.add(cbTagSet,GBC.std().fill(GBC.HORIZONTAL));
         pnl.add(new JButton(new DeleteFromHistoryAction()),GBC.std());
-        pnl.add(new JButton(new FindMatchingAction()),GBC.eol());
+        pnl.add(new JButton(new FindMatchingAction()),GBC.std());
+        final JToggleButton jt = new JToggleButton("", ImageProvider.get("restart"), true);
+        jt.setToolTipText(tr("Sync with JOSM selection"));
+        jt.addActionListener(new ActionListener(){
+            @Override public void actionPerformed(ActionEvent e) {
+                tableModel.setWatchSelection(jt.isSelected());
+            };
+        });
+        pnl.add(jt,GBC.eol());
+        
+
         pnl.add(createTypeFilterPanel(), GBC.eol().fill(GBC.HORIZONTAL));
         pnl.add(tbl.getTableHeader(),GBC.eop().fill(GBC.HORIZONTAL));
@@ -103 +109 @@
     private JTable createTable() {
         JTable t = new JTable(tableModel);
+        tableModel.setTable(t);
         t.setFillsViewportHeight(true);
-        t.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        t.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         t.addMouseListener(tableMouseAdapter);
         t.setRowSelectionAllowed(true);
         t.setColumnSelectionAllowed(true);
         t.setDefaultRenderer(OsmPrimitiveType.class, new PrimitiveTypeIconRenderer());
-        t.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
         t.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
         t.getSelectionModel().addListSelectionListener(selectionListener);
@@ -216 +222 @@
                     AutoScaleAction.zoomTo(currentSelection);
                 }
+            }
+        });
+        menu.add(new AbstractAction(tr("Select"), ImageProvider.get("dialogs", "select")) {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                Main.main.getCurrentDataSet().setSelected(getSelectedPrimitives());
             }
         });

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTaggerTableModel.java

@@ -10 +10 @@
 import java.util.List;
 import java.util.Set;
+import javax.swing.JTable;
 import javax.swing.table.AbstractTableModel;
+import javax.swing.table.TableCellEditor;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
@@ -32 +34 @@
     private boolean autoCommit = true;
     List<Command> cmds = new ArrayList<Command>();
+    private boolean watchSelection = true;
+    private JTable table;
 
     public MultiTaggerTableModel() {
@@ -47 +51 @@
     }
 
+    public void setWatchSelection(boolean watchSelection) {
+        this.watchSelection = watchSelection;
+        if (watchSelection && Main.main.hasEditLayer()) selectionChanged(Main.main.getCurrentDataSet().getSelected());
+    }
+    
     @Override
     public Object getValueAt(int rowIndex, int columnIndex) {
@@ -86 +95 @@
     @Override
     public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-        updateData(newSelection);
+        if (watchSelection)
+            updateData(newSelection);
     }
 
@@ -164 +174 @@
 
     void updateData(Collection<? extends OsmPrimitive> sel) {
-        list.clear();
+       if (table.isEditing()) table.getCellEditor().stopCellEditing();
+       
+       list.clear();
         for (OsmPrimitive p : sel) {
             if (shownTypes.contains(p.getDisplayType())) {
@@ -181 +193 @@
         cmds.clear();
     }
+
+    void setTable(JTable t) {
+        table = t;
+    }
 }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/ChildrenMatch.java

@@ -4 +4 @@
 import org.openstreetmap.josm.actions.search.PushbackTokenizer;
 import org.openstreetmap.josm.actions.search.SearchCompiler;
-import org.openstreetmap.josm.data.osm.Changeset;
-import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.visitor.Visitor;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
- * Matches objects with a version number in the given range.
+ * Matches objects with a number of child primitives in the given range.
  */
-public class UsedInWaysMatch extends RangeMatch {
-    public UsedInWaysMatch(PushbackTokenizer.Range range) {super(range);}
-    public UsedInWaysMatch(PushbackTokenizer tokenizer) throws SearchCompiler.ParseError {
-        this(tokenizer.readRange(tr("Range of attached way cuunt")));
+public class ChildrenMatch extends RangeMatch {
+    public ChildrenMatch(PushbackTokenizer.Range range) {super(range);}
+    public ChildrenMatch(PushbackTokenizer tokenizer) throws SearchCompiler.ParseError {
+        this(tokenizer.readRange(tr("Range of child primitives count")));
     }
-    private class WayCounter implements Visitor {
-        int count;
-        @Override
-        public void visit(Way w) { count++; }
-        @Override   public void visit(Node n) { }
-        @Override   public void visit(Relation r) {   }
-        @Override   public void visit(Changeset cs) {   }
+
+    @Override 
+    protected Long getNumber(OsmPrimitive osm) {
+        if (osm instanceof Way) {
+            return (long) ((Way)osm).getNodesCount();
+        } else if (osm instanceof Relation) {
+            return (long) ((Relation)osm).getMembersCount();
+        } else {
+            return null;
+        }
     }
-    WayCounter counter = new WayCounter();
 
-@Override protected Long getNumber(OsmPrimitive osm) {
-        if (osm instanceof Node) {
-            counter.count=0;
-            osm.visitReferrers(counter);
-            return new Long(counter.count);
-        } else return null;
-    }
-    @Override protected String getString() {
-        return "wayrefs";
+    @Override 
+    protected String getString() {
+        return "children";
     }
 }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/ParentsMatch.java

@@ -4 +4 @@
 import org.openstreetmap.josm.actions.search.PushbackTokenizer;
 import org.openstreetmap.josm.actions.search.SearchCompiler;
-import org.openstreetmap.josm.data.osm.Changeset;
-import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.visitor.Visitor;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
- * Matches objects with a version number in the given range.
+ * Matches objects with a number of parent primitives in the given range.
  */
-public class UsedInWaysMatch extends RangeMatch {
-    public UsedInWaysMatch(PushbackTokenizer.Range range) {super(range);}
-    public UsedInWaysMatch(PushbackTokenizer tokenizer) throws SearchCompiler.ParseError {
-        this(tokenizer.readRange(tr("Range of attached way cuunt")));
+public class ParentsMatch extends RangeMatch {
+    public ParentsMatch(PushbackTokenizer.Range range) {super(range);}
+    public ParentsMatch(PushbackTokenizer tokenizer) throws SearchCompiler.ParseError {
+        this(tokenizer.readRange(tr("Range of parent primitives count")));
     }
-    private class WayCounter implements Visitor {
-        int count;
-        @Override
-        public void visit(Way w) { count++; }
-        @Override   public void visit(Node n) { }
-        @Override   public void visit(Relation r) {   }
-        @Override   public void visit(Changeset cs) {   }
+    @Override 
+    protected Long getNumber(OsmPrimitive osm) {
+        return new Long(osm.getReferrers().size());
     }
-    WayCounter counter = new WayCounter();
-
-@Override protected Long getNumber(OsmPrimitive osm) {
-        if (osm instanceof Node) {
-            counter.count=0;
-            osm.visitReferrers(counter);
-            return new Long(counter.count);
-        } else return null;
-    }
-    @Override protected String getString() {
-        return "wayrefs";
+    @Override 
+    protected String getString() {
+        return "parents";
     }
 }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/UsedInRelationsMatch.java

@@ -30 +30 @@
     RelationCounter counter = new RelationCounter();
 
-    @Override protected Long getNumber(OsmPrimitive osm) {
+    @Override 
+    protected Long getNumber(OsmPrimitive osm) {
         counter.count=0;
         osm.visitReferrers(counter);
         return new Long(counter.count);
     }
-    @Override protected String getString() {
+    @Override 
+    protected String getString() {
         return "usedinrelations";
     }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/UsedInWaysMatch.java

@@ -13 +13 @@
 
 /**
- * Matches objects with a version number in the given range.
+ * Matches nodes that are attached to given range of ways
  */
 public class UsedInWaysMatch extends RangeMatch {
     public UsedInWaysMatch(PushbackTokenizer.Range range) {super(range);}
     public UsedInWaysMatch(PushbackTokenizer tokenizer) throws SearchCompiler.ParseError {
-        this(tokenizer.readRange(tr("Range of attached way cuunt")));
+        this(tokenizer.readRange(tr("Range of attached ways count")));
     }
     private class WayCounter implements Visitor {

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/UtilsSimpleMatchFactory.java

@@ -9 +9 @@
 public class UtilsSimpleMatchFactory implements SimpleMatchFactory {
     
-    private static Collection<String> keywords = Arrays.asList("usedinways", "usedinrelations");
+    private static Collection<String> keywords = Arrays.asList("usedinways", "usedinrelations", "parents", "children");
 
     @Override
@@ -24 +24 @@
             return new UsedInRelationsMatch(tokenizer);
         } else 
+        if ("parents".equals(keyword)) {
+            return new ParentsMatch(tokenizer);
+        } else
+        if ("children".equals(keyword)) {
+            return new ChildrenMatch(tokenizer);
+        } else
             return null; 
     };