id	summary	reporter	owner	description	type	status	priority	milestone	component	version	resolution	keywords	cc
3254	Unable to resolve conflict	Nakor	Nakor	"When I try to resolve a conflict (for a way that has already been deleted), I get the following error:

Manifest-Version: 1.0
Created-By: 1.6.0_0 (Sun Microsystems Inc.)
Memory Usage: 214 MB / 508 MB (70 MB allocated, but free)
Java version: 1.6.0_0

Plugins: PicLayereditgpxgraphviewremotecontrolroutingutilspluginvalidatorwaydownloaderwmsplugin
Plugin PicLayer Version: 16302
Plugin editgpx Version: 16793
Plugin graphview Version: 16836
Plugin remotecontrol Version: 16965
Plugin routing Version: 16799
Plugin utilsplugin Version: 16735
Plugin validator Version: 16970
Plugin waydownloader Version: 16963
Plugin wmsplugin Version: 16872


java.lang.NoSuchMethodError: org.openstreetmap.josm.gui.dialogs.ConflictResolutionDialog.getConflictResolver()Lorg/openstreetmap/josm/gui/conflict/ConflictResolver;
	at org.openstreetmap.josm.gui.dialogs.ConflictDialog.resolve(ConflictDialog.java:149)
	at org.openstreetmap.josm.gui.dialogs.ConflictDialog.access$000(ConflictDialog.java:59)
	at org.openstreetmap.josm.gui.dialogs.ConflictDialog$ResolveAction.actionPerformed(ConflictDialog.java:332)
	at javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:2012)
	at javax.swing.AbstractButton$Handler.actionPerformed(AbstractButton.java:2335)
	at javax.swing.DefaultButtonModel.fireActionPerformed(DefaultButtonModel.java:404)
	at javax.swing.DefaultButtonModel.setPressed(DefaultButtonModel.java:259)
	at javax.swing.plaf.basic.BasicButtonListener.mouseReleased(BasicButtonListener.java:253)
	at java.awt.AWTEventMulticaster.mouseReleased(AWTEventMulticaster.java:289)
	at java.awt.Component.processMouseEvent(Component.java:6108)
	at javax.swing.JComponent.processMouseEvent(JComponent.java:3276)
	at java.awt.Component.processEvent(Component.java:5873)
	at java.awt.Container.processEvent(Container.java:2105)
	at java.awt.Component.dispatchEventImpl(Component.java:4469)
	at java.awt.Container.dispatchEventImpl(Container.java:2163)
	at java.awt.Component.dispatchEvent(Component.java:4295)
	at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4461)
	at java.awt.LightweightDispatcher.processMouseEvent(Container.java:4125)
	at java.awt.LightweightDispatcher.dispatchEvent(Container.java:4055)
	at java.awt.Container.dispatchEventImpl(Container.java:2149)
	at java.awt.Window.dispatchEventImpl(Window.java:2478)
	at java.awt.Component.dispatchEvent(Component.java:4295)
	at java.awt.EventQueue.dispatchEvent(EventQueue.java:604)
	at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:275)
	at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:200)
	at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:190)
	at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:185)
	at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:177)
	at java.awt.EventDispatchThread.run(EventDispatchThread.java:138)
"	defect	closed	major		Core	latest	invalid