Changeset 30384 in osm for applications/editors/josm/plugins/utilsplugin2

Timestamp:

2014-04-08T20:32:56+02:00 (11 years ago)

Author:

akks

Message:

[josm_utilsplugin2]: usedinways/usedinrealtions; multitagger: center on double-click

Location:

applications/editors/josm/plugins/utilsplugin2

Files:

• build.xml (modified) (1 diff)
• nbproject/project.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/utilsplugin2/UtilsPlugin2.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagDialog.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/utilsplugin2/search/RangeMatch.java (added)
• src/org/openstreetmap/josm/plugins/utilsplugin2/search/UsedInRelationsMatch.java (added)
• src/org/openstreetmap/josm/plugins/utilsplugin2/search/UsedInWaysMatch.java (added)
• src/org/openstreetmap/josm/plugins/utilsplugin2/search/UtilsSimpleMatchFactory.java (added)
• src/org/openstreetmap/josm/plugins/utilsplugin2/search/UtilsUnaryMatchFactory.java (modified) (1 diff)

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

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

applications/editors/josm/plugins/utilsplugin2/nbproject/project.xml

@@ -65 +65 @@
             <compilation-unit>
                 <package-root>src</package-root>
-                <classpath mode="compile">../../core/src</classpath>
+                <classpath mode="compile">../../core/src;../../core/dist/josm-custom.jar</classpath>
                 <source-level>1.6</source-level>
             </compilation-unit>

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/UtilsPlugin2.java

@@ -29 +29 @@
 import org.openstreetmap.josm.plugins.utilsplugin2.multitagger.MultiTagAction;
 import org.openstreetmap.josm.plugins.utilsplugin2.replacegeometry.ReplaceGeometryAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.search.UtilsSimpleMatchFactory;
 import org.openstreetmap.josm.plugins.utilsplugin2.search.UtilsUnaryMatchFactory;
 import org.openstreetmap.josm.plugins.utilsplugin2.selection.AdjacentNodesAction;
@@ -124 +125 @@
         // register search operators
         SearchCompiler.addMatchFactory(new UtilsUnaryMatchFactory());
+        SearchCompiler.addMatchFactory(new UtilsSimpleMatchFactory());
     }
 

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

@@ -67 +67 @@
     private final HighlightHelper highlightHelper = new HighlightHelper();
     private final HistoryComboBox cbTagSet = new HistoryComboBox();
+    private List<OsmPrimitive> currentSelection;
     
     private static final String HISTORY_KEY = "utilsplugin2.multitaghistory";
@@ -72 +73 @@
         "highway, name, ${id}, ${length}",
         "name name:en name:ru name:de"};
-    TagCellEditor cellEditor;
-    
     
     public MultiTagDialog() {
@@ -168 +167 @@
         @Override
         public void mouseClicked(MouseEvent e) {
-            if (e.getButton() == MouseEvent.BUTTON3) {
-                AutoScaleAction.zoomTo(Collections.singletonList(getSelectedPrimitive()));
+            if (e.getClickCount()>1 && Main.isDisplayingMapView()) {
+                AutoScaleAction.zoomTo(currentSelection);
             }
         }
@@ -177 +176 @@
         @Override
         public void valueChanged(ListSelectionEvent e) {
-            List<OsmPrimitive> prims = getSelectedPrimitives();
-            if (prims != null && Main.isDisplayingMapView() ) {
-                if (highlightHelper.highlightOnly(prims)) {
+            currentSelection = getSelectedPrimitives();
+            if (currentSelection != null && Main.isDisplayingMapView() ) {
+                if (highlightHelper.highlightOnly(currentSelection)) {
                     Main.map.mapView.repaint();
                 }
@@ -211 +210 @@
     private JPopupMenu createPopupMenu() {
         JPopupMenu menu = new JPopupMenu();
+        menu.add(new AbstractAction(tr("Zoom to objects"), ImageProvider.get("dialogs/autoscale", "selection")) {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (Main.isDisplayingMapView()) {
+                    AutoScaleAction.zoomTo(currentSelection);
+                }
+            }
+        });
         menu.add(new AbstractAction(tr("Remove tag"), ImageProvider.get("dialogs", "delete")){
             @Override

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

@@ -24 +24 @@
         } else if ("allintersecting".equals(keyword)) {
             return new IntersectingMatch(matchOperand, true);
-        }
+        } 
         return null;
     }