Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java	(revision 4630)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java	(revision 4631)
@@ -193,5 +193,5 @@
 
         public PolyData(Way closedWay) {
-            this(closedWay.getNodes(), closedWay.isSelected(), Collections.singleton(closedWay.getId()));
+            this(closedWay.getNodes(), closedWay.isSelected(), Collections.singleton(closedWay.getUniqueId()));
         }
 
@@ -317,5 +317,5 @@
         
         public void wayNodesChanged(WayNodesChangedEvent event) {
-            final Long wayId = event.getChangedWay().getId();
+            final Long wayId = event.getChangedWay().getUniqueId();
             boolean innerChanged = false;
             for (PolyData inner : inners) {
@@ -444,5 +444,5 @@
                                 if (nodes == null) {
                                     nodes = w.getNodes();
-                                    wayIds.add(w.getId());
+                                    wayIds.add(w.getUniqueId());
                                 }
                                 nodes.remove((mode == 21 || mode == 22) ? nl : 0);
@@ -460,5 +460,5 @@
                                     }
                                 }
-                                wayIds.add(c.getId());
+                                wayIds.add(c.getUniqueId());
                             }
                         }
@@ -469,5 +469,5 @@
             if (nodes == null) {
                 nodes = w.getNodes();
-                wayIds.add(w.getId());
+                wayIds.add(w.getUniqueId());
             }
 
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java	(revision 4630)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java	(revision 4631)
@@ -276,5 +276,5 @@
                             if (multipolygon != null) {
                                 for (PolyData pd : multipolygon.getCombinedPolygons()) {
-                                    if (pd.getWayIds().contains(p.getId())) {
+                                    if (pd.getWayIds().contains(p.getUniqueId())) {
                                         pd.selected = true;
                                         selectedPolyData.add(pd);