Index: applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java =================================================================== --- applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java (revision 30640) +++ applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java (revision 30641) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.measurement; Index: applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java =================================================================== --- applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java (revision 30640) +++ applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java (revision 30641) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.measurement; /// @author Raphael Mack @@ -46,6 +47,6 @@ public class MeasurementLayer extends Layer { - public MeasurementLayer(String arg0) { - super(arg0); + public MeasurementLayer(String name) { + super(name); } @@ -53,23 +54,27 @@ private Collection points = new ArrayList(32); - @Override public Icon getIcon() { + @Override + public Icon getIcon() { return icon; } - @Override public String getToolTipText() { + @Override + public String getToolTipText() { return tr("Layer to make measurements"); } - @Override public boolean isMergable(Layer other) { + @Override + public boolean isMergable(Layer other) { //return other instanceof MeasurementLayer; return false; } - @Override public void mergeFrom(Layer from) { + @Override + public void mergeFrom(Layer from) { // TODO: nyi - doubts about how this should be done are around. Ideas? - - } - - @Override public void paint(Graphics2D g, final MapView mv, Bounds bounds) { + } + + @Override + public void paint(Graphics2D g, final MapView mv, Bounds bounds) { g.setColor(Color.green); Point l = null; @@ -84,13 +89,16 @@ } - @Override public void visitBoundingBox(BoundingXYVisitor v) { + @Override + public void visitBoundingBox(BoundingXYVisitor v) { // nothing to do here } - @Override public Object getInfoComponent() { + @Override + public Object getInfoComponent() { return getToolTipText(); } - @Override public Action[] getMenuEntries() { + @Override + public Action[] getMenuEntries() { return new Action[]{ LayerListDialog.getInstance().createShowHideLayerAction(), @@ -141,4 +149,7 @@ MeasurementPlugin.measurementDialog.pathLengthLabel.setText(NavigatableComponent.getDistText(pathLength)); } + if (Main.map.mapMode instanceof MeasurementMode) { + Main.map.statusLine.setDist(pathLength); + } } @@ -207,55 +218,56 @@ private class GPXLayerImportAction extends AbstractAction { - /** - * The data model for the list component. - */ - private DefaultListModel model = new DefaultListModel<>(); - - /** - * @param layer the targeting measurement layer - */ - public GPXLayerImportAction(MeasurementLayer layer) { - super(tr("Import path from GPX layer"), ImageProvider.get("dialogs", "edit")); // TODO: find better image - } - - @Override - public void actionPerformed(ActionEvent e) { - Box panel = Box.createVerticalBox(); - final JList layerList = new JList<>(model); - Collection data = Main.map.mapView.getAllLayers(); - Layer lastLayer = null; - int layerCnt = 0; - - for (Layer l : data){ - if(l instanceof GpxLayer){ + /** + * The data model for the list component. + */ + private DefaultListModel model = new DefaultListModel<>(); + + /** + * @param layer the targeting measurement layer + */ + public GPXLayerImportAction(MeasurementLayer layer) { + super(tr("Import path from GPX layer"), ImageProvider.get("dialogs", "edit")); // TODO: find better image + } + + @Override + public void actionPerformed(ActionEvent e) { + Box panel = Box.createVerticalBox(); + final JList layerList = new JList<>(model); + Collection data = Main.map.mapView.getAllLayers(); + Layer lastLayer = null; + int layerCnt = 0; + + for (Layer l : data) { + if (l instanceof GpxLayer) { model.addElement((GpxLayer) l); lastLayer = l; layerCnt++; } - } - if(layerCnt == 1){ + } + if (layerCnt == 1) { layerList.setSelectedValue(lastLayer, true); } - if(layerCnt > 0){ - + if (layerCnt > 0) { layerList.setCellRenderer(new DefaultListCellRenderer(){ - @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { - Layer layer = (Layer)value; - JLabel label = (JLabel)super.getListCellRendererComponent(list, - layer.getName(), index, isSelected, cellHasFocus); - Icon icon = layer.getIcon(); - label.setIcon(icon); - label.setToolTipText(layer.getToolTipText()); - return label; - } - }); - + @Override + public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { + Layer layer = (Layer)value; + JLabel label = (JLabel)super.getListCellRendererComponent(list, + layer.getName(), index, isSelected, cellHasFocus); + Icon icon = layer.getIcon(); + label.setIcon(icon); + label.setToolTipText(layer.getToolTipText()); + return label; + } + }); + JCheckBox dropFirst = new JCheckBox(tr("Drop existing path")); - + panel.add(layerList); panel.add(dropFirst); - + final JOptionPane optionPane = new JOptionPane(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION){ - @Override public void selectInitialValue() { + @Override + public void selectInitialValue() { layerList.requestFocusInWindow(); } @@ -263,5 +275,5 @@ final JDialog dlg = optionPane.createDialog(Main.parent, tr("Import path from GPX layer")); dlg.setVisible(true); - + Object answer = optionPane.getValue(); if (answer == null || answer == JOptionPane.UNINITIALIZED_VALUE || @@ -269,7 +281,7 @@ return; } - + GpxLayer gpx = (GpxLayer)layerList.getSelectedValue(); - if(dropFirst.isSelected()){ + if (dropFirst.isSelected()) { points = new ArrayList(32); } @@ -281,8 +293,8 @@ } } - } + } recalculate(); Main.parent.repaint(); - }else{ + } else{ // TODO: register a listener and show menu entry only if gps layers are available // no gps layer Index: applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementMode.java =================================================================== --- applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementMode.java (revision 30640) +++ applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementMode.java (revision 30641) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.measurement; @@ -16,15 +17,17 @@ private static final long serialVersionUID = 3853830673475744263L; - + public MeasurementMode(MapFrame mapFrame, String name, String desc) { super(name, "measurement.png", desc, mapFrame, Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR)); } - @Override public void enterMode() { + @Override + public void enterMode() { super.enterMode(); Main.map.mapView.addMouseListener(this); } - @Override public void exitMode() { + @Override + public void exitMode() { super.exitMode(); Main.map.mapView.removeMouseListener(this); @@ -39,8 +42,9 @@ * was part of. */ - @Override public void mouseClicked(MouseEvent e) { + @Override + public void mouseClicked(MouseEvent e) { if (e.getButton() == MouseEvent.BUTTON3){ MeasurementPlugin.getCurrentLayer().removeLastPoint(); - }else if (e.getButton() == MouseEvent.BUTTON1){ + } else if (e.getButton() == MouseEvent.BUTTON1){ LatLon coor = Main.map.mapView.getLatLon(e.getX(), e.getY()); if (coor.isOutSideWorld()) { @@ -51,4 +55,3 @@ } } - } Index: applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java =================================================================== --- applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java (revision 30640) +++ applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java (revision 30641) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.measurement; /// @author Raphael Mack