Opened 16 years ago
Closed 16 years ago
#3230 closed defect (fixed)
Bug affecting colfict resolving
| Reported by: | oudalricus | Owned by: | team |
|---|---|---|---|
| Priority: | major | Milestone: | |
| Component: | Core | Version: | latest |
| Keywords: | conflict | Cc: |
Description
What I've done: made some edits, tried to upload. There was a conflict pertaining to some relation. Two conflicts are displayed in the conflicts pane, one titled "incomplete" and the other "route ("Kylltalweg", 221 members)". When I try to resolve either of them, I get an error saying "Unexpected Exception". Looks like none of my edits were actually uploaded. Hooray!
Path: trunk
URL: http://josm.openstreetmap.de/svn/trunk
Repository Root: http://josm.openstreetmap.de/svn
Repository UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Revision: 1938
Node Kind: directory
Last Changed Author: jttt
Last Changed Rev: 1938
Last Changed Date: 2009-08-08 22:39:04 +0200 (Sat, 08 Aug 2009)
Memory Usage: 747 MB / 747 MB (239 MB allocated, but free)
Java version: 1.6.0_14
Plugins: wmsplugin
Plugin wmsplugin Version: 16442
java.lang.NullPointerException
at org.openstreetmap.josm.gui.conflict.ConflictResolver.addPropertyChangeListener(ConflictResolver.java:153)
at javax.swing.plaf.synth.SynthPanelUI.installListeners(SynthPanelUI.java:49)
at javax.swing.plaf.synth.SynthPanelUI.installUI(SynthPanelUI.java:38)
at javax.swing.JComponent.setUI(JComponent.java:673)
at javax.swing.JPanel.setUI(JPanel.java:136)
at javax.swing.JPanel.updateUI(JPanel.java:109)
at javax.swing.JPanel.<init>(JPanel.java:69)
at javax.swing.JPanel.<init>(JPanel.java:92)
at javax.swing.JPanel.<init>(JPanel.java:100)
at org.openstreetmap.josm.gui.conflict.ConflictResolver.<init>(ConflictResolver.java:107)
at org.openstreetmap.josm.gui.dialogs.ConflictResolutionDialog.build(ConflictResolutionDialog.java:145)
at org.openstreetmap.josm.gui.dialogs.ConflictResolutionDialog.<init>(ConflictResolutionDialog.java:156)
at org.openstreetmap.josm.gui.dialogs.ConflictDialog.resolve(ConflictDialog.java:148)
at org.openstreetmap.josm.gui.dialogs.ConflictDialog.access$000(ConflictDialog.java:59)
at org.openstreetmap.josm.gui.dialogs.ConflictDialog$1.mouseClicked(ConflictDialog.java:91)
at java.awt.AWTEventMulticaster.mouseClicked(AWTEventMulticaster.java:253)
at java.awt.Component.processMouseEvent(Component.java:6266)
at javax.swing.JComponent.processMouseEvent(JComponent.java:3267)
at java.awt.Component.processEvent(Component.java:6028)
at java.awt.Container.processEvent(Container.java:2041)
at java.awt.Component.dispatchEventImpl(Component.java:4630)
at java.awt.Container.dispatchEventImpl(Container.java:2099)
at java.awt.Component.dispatchEvent(Component.java:4460)
at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4574)
at java.awt.LightweightDispatcher.processMouseEvent(Container.java:4247)
at java.awt.LightweightDispatcher.dispatchEvent(Container.java:4168)
at java.awt.Container.dispatchEventImpl(Container.java:2085)
at java.awt.Window.dispatchEventImpl(Window.java:2475)
at java.awt.Component.dispatchEvent(Component.java:4460)
at java.awt.EventQueue.dispatchEvent(EventQueue.java:599)
at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:269)
at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:184)
at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:174)
at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:169)
at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:161)
at java.awt.EventDispatchThread.run(EventDispatchThread.java:122)
This was most likely caused by a special initialization sequence in the Synth look & feel. It revealed that ConflictResolver didn't use property change listener management provided by JPanel.
Should be fixed in r1942.