Index: /applications/editors/josm/plugins/openstreetbugs/build.xml
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 17533)
+++ /applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 17534)
@@ -26,5 +26,5 @@
                 <attribute name="Plugin-Description" value="Imports issues from OpenStreetBugs"/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/OpenStreetBugs"/>
-                <attribute name="Plugin-Mainversion" value="2067"/>
+                <attribute name="Plugin-Mainversion" value="2082"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java	(revision 17533)
+++ /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java	(revision 17534)
@@ -125,4 +125,5 @@
 
             // don't paint deleted nodes
+
             if(!node.isUsable())
                 continue;
Index: /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java	(revision 17533)
+++ /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java	(revision 17534)
@@ -203,7 +203,5 @@
             
             // add the upload hook
-            LinkedList<UploadHook> hooks = ((UploadAction) Main.main.menu.upload).uploadHooks;
-            hooks.add(0, uploadHook);
-            
+            UploadAction.registerUploadHook(uploadHook);            
         } else if (oldFrame!=null && newFrame==null ) { // map frame removed
             
Index: /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java	(revision 17533)
+++ /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java	(revision 17534)
@@ -37,14 +37,14 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.UploadAction.UploadHook;
+import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
 public class OsbUploadHook implements UploadHook {
 
-    public boolean checkUpload(Collection<OsmPrimitive> add, Collection<OsmPrimitive> update,
-            Collection<OsmPrimitive> delete)
+    public boolean checkUpload(APIDataSet apiData)
     {
-        boolean containsOsbData = checkOpenStreetBugs(add);
-        containsOsbData |= checkOpenStreetBugs(update);
-        containsOsbData |= checkOpenStreetBugs(delete);
+        boolean containsOsbData = checkOpenStreetBugs(apiData.getPrimitivesToAdd());
+        containsOsbData |= checkOpenStreetBugs(apiData.getPrimitivesToUpdate());
+        containsOsbData |= checkOpenStreetBugs(apiData.getPrimitivesToDelete());
         if(containsOsbData) {
             JOptionPane.showMessageDialog(Main.parent,