Index: /applications/editors/josm/plugins/DirectUpload/build.xml
===================================================================
--- /applications/editors/josm/plugins/DirectUpload/build.xml	(revision 22016)
+++ /applications/editors/josm/plugins/DirectUpload/build.xml	(revision 22017)
@@ -18,5 +18,5 @@
 **
 ** To build against the core in ../../core, create a correct manifest and deploy to
-** SVN, 
+** SVN,
 **    set the properties commit.message and plugin.main.version
 ** and run
@@ -28,5 +28,5 @@
 
 	<property name="commit.message" value="Changed constructor signature of plugin main class" />
-	<property name="plugin.main.version" value="2830" />
+	<property name="plugin.main.version" value="3338" />
 
 	<property name="josm"                   location="../../core/dist/josm-custom.jar"/>
@@ -86,8 +86,8 @@
 	</target>
 	<!--
-	 ************************** Publishing the plugin *********************************** 
+	 ************************** Publishing the plugin ***********************************
 	-->
 	<!--
-	** extracts the JOSM release for the JOSM version in ../core and saves it in the 
+	** extracts the JOSM release for the JOSM version in ../core and saves it in the
 	** property ${coreversion.info.entry.revision}
 	**
@@ -138,15 +138,15 @@
 
 	<!--
-	** commits the plugin.jar 
+	** commits the plugin.jar
 	-->
 	<target name="commit-dist">
 		<echo>
 ***** Properties of published ${plugin.jar} *****
-Commit message    : '${commit.message}'					
+Commit message    : '${commit.message}'
 Plugin-Mainversion: ${plugin.main.version}
 JOSM build version: ${coreversion.info.entry.revision}
 Plugin-Version    : ${version.entry.commit.revision}
-***** / Properties of published ${plugin.jar} *****					
-					
+***** / Properties of published ${plugin.jar} *****
+
 Now commiting ${plugin.jar} ...
 </echo>
Index: /applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java
===================================================================
--- /applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java	(revision 22016)
+++ /applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java	(revision 22017)
@@ -61,10 +61,10 @@
         TRACKABLE    (tr("Trackable (only shared as anonymous, ordered points with timestamps)")),
         IDENTIFIABLE (tr("Identifiable (shown in trace list and as identifiable, ordered points with timestamps)"));
-        
+
         public final String description;
         visibility(String description) {
             this.description = description;
         }
-        
+
         /**
          * "Converts" a given description into the actual enum. Returns null if no matching description
@@ -75,16 +75,17 @@
         public static visibility desc2visi(Object desc) {
             for (visibility v : visibility.values()) {
-                if(desc.equals((String)v.description))
+                if(desc.equals(v.description))
                     return v;
             }
             return null;
         }
-        
-        public String toString() {
+
+        @Override
+		public String toString() {
             return this.name().toLowerCase();
         }
     }
 
-	
+
     // User for log in when uploading trace
     private String username = Main.pref.get("osm-server.username");
@@ -136,5 +137,5 @@
         visibilityLabel.setToolTipText(tr("Defines the visibility of your trace for other OSM users."));
         for(visibility v : visibility.values()) {
-        	visibilityCombo.addItem((String)v.description);
+        	visibilityCombo.addItem(v.description);
         }
         UrlLabel visiUrl = new UrlLabel(tr("http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"), tr("(What does that mean?)"));
@@ -508,5 +509,5 @@
      * Overrides the default actions. Will not close the window when upload trace is clicked
      */
-    @Override protected void buttonAction(ActionEvent evt) {
+    @Override protected void buttonAction(int buttonIndex, ActionEvent evt) {
         String a = evt.getActionCommand();
         if(uploadTraceText.equals(a))