Index: /applications/editors/josm/plugins/addrinterpolation/build.xml
===================================================================
--- /applications/editors/josm/plugins/addrinterpolation/build.xml	(revision 18502)
+++ /applications/editors/josm/plugins/addrinterpolation/build.xml	(revision 18503)
@@ -91,5 +91,5 @@
                 <attribute name="Plugin-Description" value="Group common Address Interpolation inputs in a single dialog,"/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/AddrInterpolation"/>
-                <attribute name="Plugin-Mainversion" value="2381"/>
+                <attribute name="Plugin-Mainversion" value="2401"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: /applications/editors/josm/plugins/czechaddress/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/czechaddress/.settings/org.eclipse.jdt.core.prefs	(revision 18503)
+++ /applications/editors/josm/plugins/czechaddress/.settings/org.eclipse.jdt.core.prefs	(revision 18503)
@@ -0,0 +1,12 @@
+#Thu Nov 05 21:57:41 CET 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Index: /applications/editors/josm/plugins/czechaddress/build.xml
===================================================================
--- /applications/editors/josm/plugins/czechaddress/build.xml	(revision 18502)
+++ /applications/editors/josm/plugins/czechaddress/build.xml	(revision 18503)
@@ -52,5 +52,5 @@
             <attribute name="Plugin-Description" value="Creating and handling address nodes and buildings within Czech Republic."/>
             <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/Cz:JOSM/Plugins/CzechAddress"/>
-            <attribute name="Plugin-Mainversion" value="2381"/>
+            <attribute name="Plugin-Mainversion" value="2401"/>
             <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
         </manifest>
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Capitalizator.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Capitalizator.java	(revision 18502)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Capitalizator.java	(revision 18503)
@@ -1,4 +1,5 @@
 package org.openstreetmap.josm.plugins.czechaddress.intelligence;
 
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -12,4 +13,5 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.plugins.czechaddress.StringUtils;
@@ -27,5 +29,5 @@
     Logger logger =  Logger.getLogger(Capitalizator.class.getName());
 
-    public Capitalizator(List<OsmPrimitive> prims, List<Street> elems) {
+    public Capitalizator(Collection<OsmPrimitive> prims, List<Street> elems) {
 
         int expResults = elems.size()/2;
@@ -58,7 +60,7 @@
 
         private AddressElement elem;
-        private List<OsmPrimitive> prims;
+        private Collection<OsmPrimitive> prims;
 
-        public StreetMatcher(AddressElement elem, List<OsmPrimitive> prims) {
+        public StreetMatcher(AddressElement elem, Collection<OsmPrimitive> prims) {
             this.elem = elem;
             this.prims = prims;
Index: /applications/editors/josm/plugins/openstreetbugs/build.xml
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 18502)
+++ /applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 18503)
@@ -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="2396"/>
+                <attribute name="Plugin-Mainversion" value="2401"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
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 18502)
+++ /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java	(revision 18503)
@@ -72,6 +72,6 @@
         uploadHook = new OsbUploadHook();
         dialog = new OsbDialog(this);
-        OsbLayer.listeners.add(dialog);
-        OsbLayer.listeners.add(this);
+        Layer.listeners.add(dialog);
+        Layer.listeners.add(this);
     }
 
@@ -241,5 +241,5 @@
         this.dataSet = dataSet;
     }
-    
+
     public OsbDialog getDialog() {
         return dialog;
Index: /applications/editors/josm/plugins/remotecontrol/build.xml
===================================================================
--- /applications/editors/josm/plugins/remotecontrol/build.xml	(revision 18502)
+++ /applications/editors/josm/plugins/remotecontrol/build.xml	(revision 18503)
@@ -26,5 +26,5 @@
                 <attribute name="Plugin-Description" value="Let other applications send commands to JOSM."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/RemoteControl"/>
-                <attribute name="Plugin-Mainversion" value="2381"/>
+                <attribute name="Plugin-Mainversion" value="2401"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: /applications/editors/josm/plugins/surveyor/build.xml
===================================================================
--- /applications/editors/josm/plugins/surveyor/build.xml	(revision 18502)
+++ /applications/editors/josm/plugins/surveyor/build.xml	(revision 18503)
@@ -37,5 +37,5 @@
                 <attribute name="Plugin-Description" value="Allow adding markers/nodes on current gps positions."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Surveyor"/>
-                <attribute name="Plugin-Mainversion" value="2396"/>
+                <attribute name="Plugin-Mainversion" value="2401"/>
                 <attribute name="Plugin-Requires" value="livegps"/>
                 <attribute name="Plugin-Stage" value="60"/>
Index: /applications/editors/josm/plugins/utilsplugin/build.xml
===================================================================
--- /applications/editors/josm/plugins/utilsplugin/build.xml	(revision 18502)
+++ /applications/editors/josm/plugins/utilsplugin/build.xml	(revision 18503)
@@ -25,5 +25,5 @@
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
                 <attribute name="Plugin-Description" value="Several utilities that make your life easier: e.g. simplify way, join areas, jump to position."/>
-                <attribute name="Plugin-Mainversion" value="2381"/>
+                <attribute name="Plugin-Mainversion" value="2401"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: /applications/editors/josm/plugins/waydownloader/build.xml
===================================================================
--- /applications/editors/josm/plugins/waydownloader/build.xml	(revision 18502)
+++ /applications/editors/josm/plugins/waydownloader/build.xml	(revision 18503)
@@ -91,5 +91,5 @@
                 <attribute name="Plugin-Description" value="Easy downloading along a long set of interconnected ways"/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/WayDownloaderPlugin"/>
-                <attribute name="Plugin-Mainversion" value="2381"/>
+                <attribute name="Plugin-Mainversion" value="2401"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>