Merging nodes is broken.

[mdk]

If you download any area and try to merge two nodes (useing "M" or CRTL drag&drop) you get an exception.

The reason is the typecast in RelationMemberConflictDecisionRenderer.java:72 with the illegal value "Prototype display value".

Build-Date: 2012-08-18 15:50:16
Revision: 5450
Is-Local-Build: true

Identification: JOSM/1.5 (5450 SVN en)
Memory Usage: 93 MB / 494 MB (30 MB allocated, but free)
Java version: 1.6.0_24, Sun Microsystems Inc., OpenJDK Client VM
Operating system: Linux
Dataset consistency test: No problems found

Plugin: ColumbusCSV (28043)
Plugin: OpeningHoursEditor (28477)
Plugin: SimplifyArea (27905)
Plugin: buildings_tools (28529)
Plugin: contourmerge (1003)
Plugin: download_along (28412)
Plugin: reltoolbox (28412)
Plugin: restart (28438)
Plugin: reverter (28535)
Plugin: tageditor (28412)
Plugin: terracer (28412)
Plugin: turnlanes (28412)
Plugin: turnrestrictions (28412)
Plugin: utilsplugin2 (28556)
Plugin: waydownloader (28412)

java.lang.ClassCastException: java.lang.String cannot be cast to org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictDecisionType
	at org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictDecisionRenderer.getListCellRendererComponent(RelationMemberConflictDecisionRenderer.java:72)
	at javax.swing.JList.updateFixedCellSize(JList.java:565)
	at javax.swing.JList.setCellRenderer(JList.java:763)
	at javax.swing.plaf.basic.BasicComboPopup$Handler.propertyChange(BasicComboPopup.java:947)
	at java.beans.PropertyChangeSupport.fire(PropertyChangeSupport.java:298)
	at java.beans.PropertyChangeSupport.firePropertyChange(PropertyChangeSupport.java:291)
	at java.beans.PropertyChangeSupport.firePropertyChange(PropertyChangeSupport.java:229)
	at java.awt.Component.firePropertyChange(Component.java:8148)
	at javax.swing.JComboBox.setRenderer(JComboBox.java:465)
	at org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictDecisionRenderer.<init>(RelationMemberConflictDecisionRenderer.java:41)
	at org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictResolverColumnModel.createColumns(RelationMemberConflictResolverColumnModel.java:17)
	at org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictResolverColumnModel.<init>(RelationMemberConflictResolverColumnModel.java:70)
	at org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictResolverTable.<init>(RelationMemberConflictResolverTable.java:21)
	at org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictResolver.build(RelationMemberConflictResolver.java:66)
	at org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictResolver.<init>(RelationMemberConflictResolver.java:118)
	at org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog.buildRelationMemberConflictResolverPanel(CombinePrimitiveResolverDialog.java:176)
	at org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog.build(CombinePrimitiveResolverDialog.java:164)
	at org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog.<init>(CombinePrimitiveResolverDialog.java:208)
	at org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog.getInstance(CombinePrimitiveResolverDialog.java:99)
	at org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog.launchIfNecessary(CombinePrimitiveResolverDialog.java:497)
	at org.openstreetmap.josm.actions.MergeNodesAction.mergeNodes(MergeNodesAction.java:287)
	at org.openstreetmap.josm.actions.MergeNodesAction.doMergeNodes(MergeNodesAction.java:250)
	at org.openstreetmap.josm.actions.mapmode.SelectAction.mergePrims(SelectAction.java:801)
	at org.openstreetmap.josm.actions.mapmode.SelectAction.confirmOrUndoMovement(SelectAction.java:780)
	at org.openstreetmap.josm.actions.mapmode.SelectAction.mouseReleased(SelectAction.java:603)
	at java.awt.AWTEventMulticaster.mouseReleased(AWTEventMulticaster.java:290)
	at java.awt.AWTEventMulticaster.mouseReleased(AWTEventMulticaster.java:289)
	at java.awt.Component.processMouseEvent(Component.java:6268)
	at javax.swing.JComponent.processMouseEvent(JComponent.java:3267)
	at java.awt.Component.processEvent(Component.java:6033)
	at java.awt.Container.processEvent(Container.java:2045)
	at java.awt.Component.dispatchEventImpl(Component.java:4629)
	at java.awt.Container.dispatchEventImpl(Container.java:2103)
	at java.awt.Component.dispatchEvent(Component.java:4455)
	at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4633)
	at java.awt.LightweightDispatcher.processMouseEvent(Container.java:4297)
	at java.awt.LightweightDispatcher.dispatchEvent(Container.java:4227)
	at java.awt.Container.dispatchEventImpl(Container.java:2089)
	at java.awt.Window.dispatchEventImpl(Window.java:2517)
	at java.awt.Component.dispatchEvent(Component.java:4455)
	at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:649)
	at java.awt.EventQueue.access$000(EventQueue.java:96)
	at java.awt.EventQueue$1.run(EventQueue.java:608)
	at java.awt.EventQueue$1.run(EventQueue.java:606)
	at java.security.AccessController.doPrivileged(Native Method)
	at java.security.AccessControlContext$1.doIntersectionPrivilege(AccessControlContext.java:105)
	at java.security.AccessControlContext$1.doIntersectionPrivilege(AccessControlContext.java:116)
	at java.awt.EventQueue$2.run(EventQueue.java:622)
	at java.awt.EventQueue$2.run(EventQueue.java:620)
	at java.security.AccessController.doPrivileged(Native Method)
	at java.security.AccessControlContext$1.doIntersectionPrivilege(AccessControlContext.java:105)
	at java.awt.EventQueue.dispatchEvent(EventQueue.java:619)
	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)

[Don-vip]

In 5451/josm:

fix #7978 - Merging nodes and upload were broken due to improper combobox initialization