diff -Nru josm-plugins-0.0.svn27285+ds1/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java josm-plugins-0.0.svn27676+ds1/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java --- josm-plugins-0.0.svn27285+ds1/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java 2011-08-10 22:45:56.000000000 +0000 +++ josm-plugins-0.0.svn27676+ds1/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java 2012-01-18 22:25:41.000000000 +0000 @@ -63,9 +63,7 @@ private JRadioButton crosspiece4 = new JRadioButton(tr("100 m")); private JRadioButton grabRes1 = new JRadioButton(tr("high")); - private JRadioButton grabRes2 = new JRadioButton(tr("medium")); - private JRadioButton grabRes3 = new JRadioButton(tr("low")); private JCheckBox layerLS3 = new JCheckBox(tr("water")); @@ -151,17 +149,8 @@ JLabel jLabelRes = new JLabel(tr("Image resolution:")); cadastrewms.add(jLabelRes, GBC.std().insets(0, 5, 10, 0)); ButtonGroup bgResolution = new ButtonGroup(); - ActionListener resActionListener = new ActionListener() { - public void actionPerformed(ActionEvent actionEvent) { - AbstractButton button = (AbstractButton) actionEvent.getSource(); - grabMultiplier4Size.setEnabled(button == grabMultiplier4); - } - }; - grabRes1.addActionListener( resActionListener); grabRes1.setToolTipText(tr("High resolution (1000x800)")); - grabRes2.addActionListener( resActionListener); grabRes2.setToolTipText(tr("Medium resolution (800x600)")); - grabRes3.addActionListener( resActionListener); grabRes3.setToolTipText(tr("Low resolution (600x400)")); bgResolution.add(grabRes1); bgResolution.add(grabRes2); diff -Nru josm-plugins-0.0.svn27285+ds1/debian/changelog josm-plugins-0.0.svn27676+ds1/debian/changelog --- josm-plugins-0.0.svn27285+ds1/debian/changelog 2011-12-26 17:57:40.000000000 +0000 +++ josm-plugins-0.0.svn27676+ds1/debian/changelog 2012-02-02 10:58:52.000000000 +0000 @@ -1,3 +1,10 @@ +josm-plugins (0.0.svn27676+ds1-1) unstable; urgency=low + + * New upstream snapshot + * Bump JOSM dependency to >= 4878 + + -- David Paleino Thu, 02 Feb 2012 11:58:45 +0100 + josm-plugins (0.0.svn27285+ds1-1) unstable; urgency=low * New upstream snapshot diff -Nru josm-plugins-0.0.svn27285+ds1/debian/control josm-plugins-0.0.svn27676+ds1/debian/control --- josm-plugins-0.0.svn27285+ds1/debian/control 2011-12-26 17:57:40.000000000 +0000 +++ josm-plugins-0.0.svn27676+ds1/debian/control 2012-02-02 10:58:52.000000000 +0000 @@ -12,13 +12,13 @@ , ant-contrib , debhelper (>= 8~) , default-jdk - , josm (>= 0.0.svn4666) + , josm (>= 0.0.svn4878) , libmetadata-extractor-java , liblog4j1.2-java , libjgrapht0.8-java , libgettext-ant-tasks-java , python -Build-Conflicts: josm (>= 0.0.svn4668) +Build-Conflicts: josm (>= 0.0.svn4879) Standards-Version: 3.9.2 Homepage: http://josm.openstreetmap.de/wiki/Plugins Vcs-Git: git://git.debian.org/pkg-osm/josm-plugins.git @@ -28,11 +28,11 @@ Architecture: all Depends: ${misc:Depends} - , josm (>= 0.0.svn4666) + , josm (>= 0.0.svn4878) , libmetadata-extractor-java , liblog4j1.2-java , libjgrapht0.8-java -Breaks: josm (>= 0.0.svn4668) +Breaks: josm (>= 0.0.svn4879) Suggests: gpsd Description: Plugins for JOSM JOSM (Java OpenStreetMap) plugin collection. diff -Nru josm-plugins-0.0.svn27285+ds1/livegps/src/livegps/LiveGpsDialog.java josm-plugins-0.0.svn27676+ds1/livegps/src/livegps/LiveGpsDialog.java --- josm-plugins-0.0.svn27285+ds1/livegps/src/livegps/LiveGpsDialog.java 2009-08-09 11:32:56.000000000 +0000 +++ josm-plugins-0.0.svn27676+ds1/livegps/src/livegps/LiveGpsDialog.java 2012-01-15 10:56:33.000000000 +0000 @@ -59,7 +59,7 @@ panel.add(speedLabel = new JLabel()); panel.add(new JLabel(tr("Course"))); panel.add(courseLabel = new JLabel()); - add(new JScrollPane(panel), BorderLayout.CENTER); + createLayout(panel, true, null); } /* (non-Javadoc) diff -Nru josm-plugins-0.0.svn27285+ds1/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java josm-plugins-0.0.svn27676+ds1/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java --- josm-plugins-0.0.svn27285+ds1/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java 2011-01-25 10:13:50.000000000 +0000 +++ josm-plugins-0.0.svn27676+ds1/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java 2012-01-15 10:56:33.000000000 +0000 @@ -10,6 +10,7 @@ import java.awt.event.ActionListener; import java.awt.event.KeyEvent; import java.text.DecimalFormat; +import java.util.Arrays; import java.util.Collection; import javax.swing.JLabel; @@ -67,12 +68,8 @@ 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 SideButton(marktr("Reset"), "select", "Measurement", tr("Reset current measurement results and delete measurement path."), this); - buttonPanel.add(resetButton); - add(buttonPanel, BorderLayout.SOUTH); JPanel valuePanel = new JPanel(new GridLayout(0,2)); @@ -98,9 +95,12 @@ segAngleLabel = new JLabel("- \u00b0"); valuePanel.add(segAngleLabel); - add(valuePanel, BorderLayout.CENTER); - this.setPreferredSize(new Dimension(0, 92)); + + createLayout(valuePanel, false, Arrays.asList(new SideButton[] { + resetButton + })); + final MeasurementDialog dlg = this; DataSet.addSelectionListener(new SelectionChangedListener() { diff -Nru josm-plugins-0.0.svn27285+ds1/routing/build.xml josm-plugins-0.0.svn27676+ds1/routing/build.xml --- josm-plugins-0.0.svn27285+ds1/routing/build.xml 2011-12-17 18:04:21.000000000 +0000 +++ josm-plugins-0.0.svn27676+ds1/routing/build.xml 2011-12-20 20:40:05.000000000 +0000 @@ -26,7 +26,7 @@ --> - + diff -Nru josm-plugins-0.0.svn27285+ds1/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java josm-plugins-0.0.svn27676+ds1/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java --- josm-plugins-0.0.svn27285+ds1/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java 2009-06-06 20:25:31.000000000 +0000 +++ josm-plugins-0.0.svn27676+ds1/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java 2011-12-20 20:40:05.000000000 +0000 @@ -38,6 +38,8 @@ import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.gui.layer.Layer; + import com.innovant.josm.plugin.routing.RoutingLayer; import com.innovant.josm.plugin.routing.RoutingPlugin; import com.innovant.josm.plugin.routing.gui.RoutingDialog; @@ -104,5 +106,7 @@ } Main.map.repaint(); } - + @Override public boolean layerIsSupported(Layer l) { + return l instanceof RoutingLayer; + } } diff -Nru josm-plugins-0.0.svn27285+ds1/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java josm-plugins-0.0.svn27676+ds1/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java --- josm-plugins-0.0.svn27285+ds1/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java 2009-07-03 21:35:00.000000000 +0000 +++ josm-plugins-0.0.svn27676+ds1/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java 2011-12-20 20:40:05.000000000 +0000 @@ -40,6 +40,8 @@ import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.gui.layer.Layer; + import com.innovant.josm.plugin.routing.RoutingLayer; import com.innovant.josm.plugin.routing.RoutingModel; import com.innovant.josm.plugin.routing.RoutingPlugin; @@ -153,4 +155,8 @@ Main.map.repaint(); } } + @Override public boolean layerIsSupported(Layer l) { + return l instanceof RoutingLayer; + } + } diff -Nru josm-plugins-0.0.svn27285+ds1/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java josm-plugins-0.0.svn27676+ds1/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java --- josm-plugins-0.0.svn27285+ds1/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java 2009-07-03 21:35:00.000000000 +0000 +++ josm-plugins-0.0.svn27676+ds1/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java 2011-12-20 20:40:05.000000000 +0000 @@ -38,6 +38,7 @@ import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.gui.layer.Layer; import com.innovant.josm.plugin.routing.RoutingLayer; import com.innovant.josm.plugin.routing.RoutingModel; @@ -121,4 +122,8 @@ } } + @Override public boolean layerIsSupported(Layer l) { + return l instanceof RoutingLayer; + } + } diff -Nru josm-plugins-0.0.svn27285+ds1/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java josm-plugins-0.0.svn27676+ds1/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java --- josm-plugins-0.0.svn27285+ds1/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java 2011-04-14 14:26:36.000000000 +0000 +++ josm-plugins-0.0.svn27676+ds1/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java 2012-01-15 11:15:52.000000000 +0000 @@ -69,7 +69,7 @@ super(tr("Routing"), "routing", tr("Open a list of routing nodes"), Shortcut.registerShortcut("subwindow:relations", tr("Toggle: {0}", tr("Routing")), KeyEvent.VK_R, Shortcut.GROUP_LAYER), 150); model = new DefaultListModel(); - add(getJScrollPane(), BorderLayout.CENTER); + createLayout(getJScrollPane(), false, null); } /** diff -Nru josm-plugins-0.0.svn27285+ds1/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java josm-plugins-0.0.svn27676+ds1/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java --- josm-plugins-0.0.svn27285+ds1/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java 2011-12-17 18:04:21.000000000 +0000 +++ josm-plugins-0.0.svn27676+ds1/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java 2011-12-20 20:40:05.000000000 +0000 @@ -194,16 +194,12 @@ addRouteNodeButton = new IconToggleButton(addRouteNodeAction); removeRouteNodeButton = new IconToggleButton(removeRouteNodeAction); moveRouteNodeButton = new IconToggleButton(moveRouteNodeAction); + addRouteNodeButton.setAutoHideDisabledButton(true); + removeRouteNodeButton.setAutoHideDisabledButton(true); + moveRouteNodeButton.setAutoHideDisabledButton(true); newFrame.addMapMode(addRouteNodeButton); newFrame.addMapMode(removeRouteNodeButton); newFrame.addMapMode(moveRouteNodeButton); -// newFrame.toolGroup.add(addRouteNodeButton); -// newFrame.toolGroup.add(removeRouteNodeButton); -// newFrame.toolGroup.add(moveRouteNodeButton); - // Hide them by default - addRouteNodeButton.setVisible(false); - removeRouteNodeButton.setVisible(false); - moveRouteNodeButton.setVisible(false); // Enable menu menu.enableStartItem(); newFrame.addToggleDialog(routingDialog); @@ -215,18 +211,11 @@ * @see org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener#activeLayerChange(org.openstreetmap.josm.gui.layer.Layer, org.openstreetmap.josm.gui.layer.Layer) */ public void activeLayerChange(Layer oldLayer, Layer newLayer) { - if (addRouteNodeButton==null) return; if (newLayer instanceof RoutingLayer) { /* show Routing toolbar and dialog window */ - addRouteNodeButton.setVisible(true); - removeRouteNodeButton.setVisible(true); - moveRouteNodeButton.setVisible(true); menu.enableRestOfItems(); routingDialog.showDialog(); routingDialog.refresh(); }else{ /* hide Routing toolbar and dialog window */ - addRouteNodeButton.setVisible(false); - removeRouteNodeButton.setVisible(false); - moveRouteNodeButton.setVisible(false); menu.disableRestOfItems(); routingDialog.hideDialog(); } @@ -239,9 +228,6 @@ public void layerAdded(Layer newLayer) { // Add button(s) to the tool bar when the routing layer is added if (newLayer instanceof RoutingLayer) { - addRouteNodeButton.setVisible(true); - removeRouteNodeButton.setVisible(true); - moveRouteNodeButton.setVisible(true); menu.enableRestOfItems(); // Set layer on top and select layer, also refresh toggleDialog to reflect selection Main.map.mapView.moveLayer(newLayer, 0); diff -Nru josm-plugins-0.0.svn27285+ds1/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java josm-plugins-0.0.svn27676+ds1/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java --- josm-plugins-0.0.svn27285+ds1/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java 2011-10-30 22:41:51.000000000 +0000 +++ josm-plugins-0.0.svn27676+ds1/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java 2011-12-30 23:58:45.000000000 +0000 @@ -128,7 +128,11 @@ parser.map("action", SurveyorActionDescription.class); SurveyorComponent surveyorComponent = null; - parser.start(in); + try { + parser.start(in); + } catch(SAXException e) { + e.printStackTrace(); + } List actions = new ArrayList(); while(parser.hasNext()) { Object object = parser.next(); diff -Nru josm-plugins-0.0.svn27285+ds1/svn-info.xml josm-plugins-0.0.svn27676+ds1/svn-info.xml --- josm-plugins-0.0.svn27285+ds1/svn-info.xml 2011-12-26 17:44:39.000000000 +0000 +++ josm-plugins-0.0.svn27676+ds1/svn-info.xml 2012-02-02 10:52:43.000000000 +0000 @@ -3,16 +3,16 @@ + revision="27690"> http://svn.openstreetmap.org/applications/editors/josm/plugins http://svn.openstreetmap.org b9d5c4c9-76e1-0310-9c85-f3177eceb1e4 -akks -2011-12-26T17:42:16.199424Z + revision="27679"> +roland +2012-02-01T20:19:27.708417Z