Index: /trunk/src/org/openstreetmap/josm/gui/MapFrame.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 8948) +++ /trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 8949) @@ -141,9 +141,9 @@ // Map modes public final SelectAction mapModeSelect; + public final DrawAction mapModeDraw; + public final ZoomAction mapModeZoom; public LassoModeAction mapModeSelectLasso; private final transient Map lastMapMode = new HashMap<>(); - private final MapMode mapModeDraw; - private final MapMode mapModeZoom; /** Index: /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java (revision 8949) +++ /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java (revision 8949) @@ -0,0 +1,98 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.actions.mapmode; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.awt.event.InputEvent; +import java.awt.event.MouseEvent; +import java.lang.reflect.Field; +import java.util.Arrays; +import java.util.Collection; + +import javax.swing.JList; + +import org.junit.BeforeClass; +import org.junit.Test; +import org.openstreetmap.josm.JOSMFixture; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.gui.MapFrame; +import org.openstreetmap.josm.gui.OsmPrimitivRenderer; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; + +/** + * Unit tests for class {@link DrawAction}. + */ +public class DrawActionTest { + + /** + * Setup test. + */ + @BeforeClass + public static void setUpBeforeClass() { + JOSMFixture.createUnitTestFixture().init(true); + } + + /** + * Non regression test case for bug #12011. + * Add a new node in the middle of way then undo. The rendering of the node, selected, must not cause any crash in OsmPrimitivRenderer. + * @throws SecurityException see {@link Class#getDeclaredField} for details + * @throws NoSuchFieldException see {@link Class#getDeclaredField} for details + * @throws IllegalAccessException see {@link Field#set} for details + * @throws IllegalArgumentException see {@link Field#set} for details + */ + @Test + public void testTicket12011() throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException { + DataSet dataSet = new DataSet(); + OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null); + + Field mapView = MapFrame.class.getDeclaredField("mapView"); + mapView.setAccessible(true); + mapView.set(Main.map, new MapViewMock(dataSet, layer)); + + Node n1 = new Node(new EastNorth(0, 0)); + Node n2 = new Node(new EastNorth(100, 0)); + + dataSet.addPrimitive(n1); + dataSet.addPrimitive(n2); + + Way w = new Way(); + w.setNodes(Arrays.asList(new Node[] {n1, n2})); + dataSet.addPrimitive(w); + + Main.main.addLayer(layer); + assertTrue(Main.map.selectDrawTool(false)); + + Main.map.mapModeDraw.mouseReleased(new MouseEvent( + Main.map, + MouseEvent.MOUSE_RELEASED, + 2000, + InputEvent.BUTTON1_MASK, + 50, 0, + 2, false)); + + JList lstPrimitives = new JList<>(); + OsmPrimitivRenderer renderer = new OsmPrimitivRenderer(); + + assertEquals(3, w.getNodesCount()); + Collection sel = dataSet.getSelectedNodes(); + assertEquals(1, sel.size()); + + Node n3 = sel.iterator().next(); + + assertNotNull(renderer.getListCellRendererComponent(lstPrimitives, n3, 0, false, false)); + + Main.main.undoRedo.undo(); + + assertEquals(2, w.getNodesCount()); + assertTrue(dataSet.getSelectedNodes().isEmpty()); + + assertNotNull(renderer.getListCellRendererComponent(lstPrimitives, n3, 0, false, false)); + } +} Index: /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/MapViewMock.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/MapViewMock.java (revision 8949) +++ /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/MapViewMock.java (revision 8949) @@ -0,0 +1,69 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.actions.mapmode; + +import java.awt.Cursor; +import java.awt.event.MouseListener; +import java.awt.geom.Point2D; + +import org.openstreetmap.josm.data.coor.EastNorth; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.gui.MapView; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; + +class MapViewMock extends MapView { + private final OsmDataLayer layer; + private final DataSet currentDataSet; + + MapViewMock(DataSet dataSet, OsmDataLayer layer) { + super(null, null); + this.layer = layer; + this.currentDataSet = dataSet; + } + + @Override + public EastNorth getEastNorth(int x, int y) { + return new EastNorth(x, y); + } + + @Override + public void addMouseListener(MouseListener ml) {} + + @Override + public void removeMouseListener(MouseListener ml) {} + + @Override + public void setVirtualNodesEnabled(boolean enabled) {} + + @Override + public void setNewCursor(Cursor cursor, Object reference) {} + + @Override + public void setNewCursor(int cursor, Object reference) {} + + @Override + public boolean isActiveLayerVisible() { + return true; + } + + @Override + public void requestClearRect() {} + + @Override + public Point2D getPoint2D(EastNorth p) { + return new Point2D.Double(p.getX(), p.getY()); + } + + @Override + public void setActiveLayer(Layer layer) {} + + @Override + public Layer getActiveLayer() { + return layer; + } + + @Override + protected DataSet getCurrentDataSet() { + return currentDataSet; + } +} Index: /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java (revision 8948) +++ /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java (revision 8949) @@ -7,9 +7,6 @@ import static org.junit.Assert.fail; -import java.awt.Cursor; import java.awt.event.InputEvent; import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.awt.geom.Point2D; import java.lang.reflect.Field; import java.util.Arrays; @@ -26,6 +23,4 @@ import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.MapFrame; -import org.openstreetmap.josm.gui.MapView; -import org.openstreetmap.josm.gui.layer.Layer; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -34,61 +29,4 @@ */ public class SelectActionTest { - - private class MapViewMock extends MapView { - private OsmDataLayer layer; - private DataSet currentDataSet; - - MapViewMock(DataSet dataSet, OsmDataLayer layer) { - super(null, null); - this.layer = layer; - this.currentDataSet = dataSet; - } - - @Override - public EastNorth getEastNorth(int x, int y) { - return new EastNorth(x, y); - } - - @Override - public void addMouseListener(MouseListener ml) {} - - @Override - public void removeMouseListener(MouseListener ml) {} - - @Override - public void setVirtualNodesEnabled(boolean enabled) {} - - @Override - public void setNewCursor(Cursor cursor, Object reference) {} - - @Override - public void setNewCursor(int cursor, Object reference) {} - - @Override - public boolean isActiveLayerVisible() { - return true; - } - - @Override - public void requestClearRect() {} - - @Override - public Point2D getPoint2D(EastNorth p) { - return new Point2D.Double(p.getX(), p.getY()); - } - - @Override - public void setActiveLayer(Layer layer) {} - - @Override - public Layer getActiveLayer() { - return layer; - } - - @Override - protected DataSet getCurrentDataSet() { - return currentDataSet; - } - } /** @@ -134,5 +72,5 @@ */ @BeforeClass - public static void setUp() { + public static void setUpBeforeClass() { JOSMFixture.createUnitTestFixture().init(true); }