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 17401)
+++ applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java	(revision 17532)
@@ -121,6 +121,7 @@
         JPanel content = initComponents();
         autoSelectTrace();
-
-        setupDialog(content, new String[] { "uploadtrace.png", "cancel.png" });
+        setContent(content);
+        setButtonIcons(new String[] { "uploadtrace.png", "cancel.png" });
+        setupDialog();
 
         buttons.get(0).setEnabled(!checkForGPXLayer());