Changeset 12471 in osm

Timestamp:

2008-12-22T14:07:28+01:00 (16 years ago)

Author:

stoecker

Message:

updated

Location:

applications/editors/josm/plugins/measurement

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/measurement/MeasurementMode.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java (modified) (3 diffs)

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

@@ -42 +42 @@
         <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
         <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+        <attribute name="Plugin-Mainversion" value="1153" />
       </manifest>
     </jar>

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.measurement;
 
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -21 +22 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
+import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.Main;
 
@@ -36 +39 @@
      * The reset button
      */
-    private JButton resetButton;
-    
+    private SideButton resetButton;
+
     /**
      * The measurement label for the path length
      */
     protected JLabel pathLengthLabel;
-    
+
     /**
      * The measurement label for the currently selected segments
      */
     protected JLabel selectLengthLabel;
-    
+
     /**
      * The measurement label for area of the currently selected loop
      */
     protected JLabel selectAreaLabel;
-    
+
     /**
      * The measurement label for the segment angle, actually updated, if 2 nodes are selected
      */
     protected JLabel segAngleLabel;
-    
+
     /**
      * Constructor
@@ -63 +66 @@
     public MeasurementDialog() 
     {
-        super(tr("Measured values"), "measure", tr("Open the measurement window."), KeyEvent.VK_M, KeyEvent.ALT_DOWN_MASK);
-        
+        super(tr("Measured values"), "measure", tr("Open the measurement window."),
+        Shortcut.registerShortcut("subwindow:measurement", tr("Toggle: {0}", tr("Measured values")),
+        KeyEvent.VK_M, Shortcut.GROUP_LAYER), 150);
+
         JPanel buttonPanel = new JPanel(new GridLayout(1,2));
-        
-                resetButton = new JButton(tr("Reset"), ImageProvider.get("mapmode/selection/select"));
-                resetButton.setActionCommand("Reset");
-                resetButton.addActionListener(this);
-                resetButton.setToolTipText(tr("Reset current measurement results and delete measurement path."));
-//              resetButton.putClientProperty("help", "Dialog/SelectionList/Reset");
-                
+
+        resetButton = new SideButton(marktr("Reset"), "select", "Measurement",
+                tr("Reset current measurement results and delete measurement path."), this);
         buttonPanel.add(resetButton);
         add(buttonPanel, BorderLayout.SOUTH);

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementMode.java

@@ -48 +48 @@
                                 return;
                         }
-                        if (MeasurementPlugin.currentLayer == null){
-                                Main.main.addLayer(new MeasurementLayer("Measurement"));
-                        }
-                        MeasurementPlugin.currentLayer.mouseClicked(e);
+                        MeasurementPlugin.getCurrentLayer().mouseClicked(e);
                 }
         }

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java

@@ -6 +6 @@
 import org.openstreetmap.josm.gui.IconToggleButton;
 import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
 import org.openstreetmap.josm.plugins.Plugin;
 
@@ -26 +26 @@
         @Override
         public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
-                if(newFrame != null){
+                if(newFrame != null)
                         newFrame.addToggleDialog(measurementDialog);
-                }
-                if(Main.map != null){
-                        Main.map.toolBarActions.add(btn);
-                        Main.map.toolGroup.add(btn);
-                        
-                        Main.map.mapView.addLayerChangeListener(new LayerChangeListener(){
+                if(Main.map != null)
+                        Main.map.addMapMode(btn);
+        }
+
+        public static MeasurementLayer getCurrentLayer(){
+                if(currentLayer == null){
+                        currentLayer = new MeasurementLayer(tr("Measurement"));
+                        Main.main.addLayer(currentLayer);
+                        currentLayer.listeners.add(new LayerChangeListener(){
                                 public void activeLayerChange(final Layer oldLayer, final Layer newLayer) {
                                         if(newLayer instanceof MeasurementLayer)
@@ -44 +47 @@
                         });
                 }
-        }
-
-        public static MeasurementLayer getCurrentLayer(){
-                if(currentLayer == null){
-                        currentLayer = new MeasurementLayer("Measurement");
-                        Main.main.addLayer(currentLayer);
-                }
                 return currentLayer;
         }