ContourMerge throw NoSuchMethodError after "Sonar/FindBugs - Loose coupling" fixes

[mdk]

How to reproduce:
1) Activate contour merge tool
2) Select any node which is part of a way

Expected result:
The Node should be marked with a yellow cross

What happens instead:
A NoSuchMethodError exception is thrown. (see below)

ContourMerge plugin was not updated after changing the return type of org.openstreetmap.josm.data.osm.OsmPrimitive.getFilteredSet from LinkedHashSet<T> to Set<T> in r6317. Perhaps there are other plugins which got problems with the "Sonar/FindBugs - Loose coupling" fixes.

Repository Root: http://josm.openstreetmap.de/svn
Build-Date: 2013-10-08 01:35:02
Last Changed Author: Don-vip
Revision: 6317
Repository UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
URL: http://josm.openstreetmap.de/svn/trunk
Last Changed Date: 2013-10-07 22:45:15 +0200 (Mon, 07 Oct 2013)
Last Changed Rev: 6317

Identification: JOSM/1.5 (6317 en) Linux Ubuntu 13.04
Memory Usage: 174 MB / 876 MB (29 MB allocated, but free)
Java version: 1.7.0_25, Oracle Corporation, OpenJDK Server VM
Java package: openjdk-7-jre:i386-7u25-2.3.10-1ubuntu0.13.04.2
VM arguments: [-Djosm.restart=true, -Djosm.home=/home/michael/.josm-latest, -Djava.net.useSystemProxies=true]
Dataset consistency test: No problems found

Plugin: ColumbusCSV (29854)
Plugin: FastDraw (29854)
Plugin: HouseNumberTaggingTool (29854)
Plugin: OpeningHoursEditor (29854)
Plugin: RoadSigns (29854)
Plugin: SimplifyArea (30017)
Plugin: buildings_tools (30010)
Plugin: contourmerge (1007)
Plugin: imagery_offset_db (29832)
Plugin: poly (29854)
Plugin: public_transport (29862)
Plugin: reltoolbox (29854)
Plugin: reverter (30017)
Plugin: terracer (29854)
Plugin: turnrestrictions (29854)
Plugin: utilsplugin2 (30017)

java.lang.NoSuchMethodError: org.openstreetmap.josm.data.osm.OsmPrimitive.getFilteredSet(Ljava/util/Collection;Ljava/lang/Class;)Ljava/util/LinkedHashSet;
	at org.openstreetmap.josm.plugins.contourmerge.ContourMergeModel.computeSelectedNodesOnWay(ContourMergeModel.java:230)
	at org.openstreetmap.josm.plugins.contourmerge.ContourMergeModel.computeSelectedNodeIndicesOnWay(ContourMergeModel.java:268)
	at org.openstreetmap.josm.plugins.contourmerge.ContourMergeModel.getWaySliceFromSelectedNodes(ContourMergeModel.java:294)
	at org.openstreetmap.josm.plugins.contourmerge.ContourMergeModel.getDragSource(ContourMergeModel.java:376)
	at org.openstreetmap.josm.plugins.contourmerge.ContourMergeView.paint(ContourMergeView.java:355)
	at org.openstreetmap.josm.gui.MapView.paint(MapView.java:632)
	at javax.swing.JComponent.paintChildren(JComponent.java:878)
	at javax.swing.JComponent.paint(JComponent.java:1054)
	at javax.swing.JComponent.paintToOffscreen(JComponent.java:5212)
	at javax.swing.BufferStrategyPaintManager.paint(BufferStrategyPaintManager.java:295)
	at javax.swing.RepaintManager.paint(RepaintManager.java:1236)
	at javax.swing.JComponent._paintImmediately(JComponent.java:5160)
	at javax.swing.JComponent.paintImmediately(JComponent.java:4971)
	at javax.swing.RepaintManager$3.run(RepaintManager.java:796)
	at javax.swing.RepaintManager$3.run(RepaintManager.java:784)
	at java.security.AccessController.doPrivileged(Native Method)
	at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:76)
	at javax.swing.RepaintManager.paintDirtyRegions(RepaintManager.java:784)
	at javax.swing.RepaintManager.paintDirtyRegions(RepaintManager.java:757)
	at javax.swing.RepaintManager.prePaintDirtyRegions(RepaintManager.java:706)
	at javax.swing.RepaintManager.access$1000(RepaintManager.java:62)
	at javax.swing.RepaintManager$ProcessingRunnable.run(RepaintManager.java:1647)
	at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:251)
	at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:733)
	at java.awt.EventQueue.access$200(EventQueue.java:103)
	at java.awt.EventQueue$3.run(EventQueue.java:694)
	at java.awt.EventQueue$3.run(EventQueue.java:692)
	at java.security.AccessController.doPrivileged(Native Method)
	at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:76)
	at java.awt.EventQueue.dispatchEvent(EventQueue.java:703)
	at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:242)
	at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:161)
	at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:150)
	at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:146)
	at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:138)
	at java.awt.EventDispatchThread.run(EventDispatchThread.java:91)