steps toward simpler widgetset creation. Still needs a lot of cleaning and refining.

svn changeset:8930/svn branch:2009-09-widget-packaging_3332

1 files changed, 7 insertions, 4 deletions

diff --git a/src/com/vaadin/ui/Upload.java b/src/com/vaadin/ui/Upload.java
index cdea1e6ce3..2ea347fc56 100644
--- a/src/com/vaadin/ui/Upload.java
+++ b/src/com/vaadin/ui/Upload.java
@@ -1,5 +1,5 @@
-/* 
-@ITMillApache2LicenseForJavaFiles@
+/*
+ * @ITMillApache2LicenseForJavaFiles@
  */
 
 package com.vaadin.ui;
@@ -17,6 +17,7 @@ import com.vaadin.Application;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.UploadStream;
+import com.vaadin.terminal.gwt.client.ui.VUpload;
 
 /**
  * Component for uploading files from client to server.
@@ -54,6 +55,7 @@ import com.vaadin.terminal.UploadStream;
  * @since 3.0
  */
 @SuppressWarnings("serial")
+@ClientWidget(VUpload.class)
 public class Upload extends AbstractComponent implements Component.Focusable {
 
     private boolean delayedFocus;
@@ -200,12 +202,13 @@ public class Upload extends AbstractComponent implements Component.Focusable {
                 try {
                     // still try to close output stream
                     out.close();
-                } catch (IOException e1) {
-                    // NOP
+                } catch (IOException ignored) {
                 }
                 fireUploadInterrupted(filename, type, totalBytes, e);
                 endUpload();
                 interrupted = false;
+                // throw cause ahead
+                throw new IllegalStateException("Uploading failed", e);
             }
         }
     }