Separate immediate mode for Upload from AbstactComponent.immediate

Makes it possible to remove the immediate from AbstractComponent.
Part 2 / 2 of adding proper Upload immediateMode, first was to move
old Upload to v7 compatiblity packages.

Change-Id: Iff99df70d9465fa1f3bad4baae44a0488eba01c0

7 files changed, 8 insertions, 8 deletions

diff --git a/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
index 7344d05403..8bd16c8461 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
@@ -74,7 +74,7 @@ public class TestForStyledUpload extends LegacyApplication
 
         up = new Upload(null, buffer);
         up.setButtonCaption("Select file");
-        up.setImmediate(true);
+        up.setImmediateMode(true);
         up.addFinishedListener(this);
         up.addFailedListener(this);
         up.addSucceededListener(this);
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
index e5cc82374d..56c10a13c3 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
@@ -105,7 +105,7 @@ public class TestForUpload extends CustomComponent
         main.addComponent(textFieldValue);
 
         up = new Upload("Upload", buffer);
-        up.setImmediate(true);
+        up.setImmediateMode(true);
         up.addListener(new Listener() {
             private static final long serialVersionUID = -8319074730512324303L;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/UploadCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/UploadCssTest.java
index 9aac96c88f..1fa591ebc0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/UploadCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/UploadCssTest.java
@@ -14,7 +14,7 @@ public class UploadCssTest {
 
         up = new Upload();
         up.setId("upload" + debugIdCounter++);
-        up.setImmediate(true);
+        up.setImmediateMode(true);
         parent.addComponent(up);
     }
 }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java b/uitest/src/main/java/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
index 4cd28936b5..8235b7170c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
@@ -36,7 +36,7 @@ public class TestImmediateUploadInFormLayout
         FormLayout formLayout = new FormLayout();
         formLayout.setWidth("100%");
         Upload u = new Upload("Upload in FormLayout", this);
-        u.setImmediate(true);
+        u.setImmediateMode(true);
         formLayout.addComponent(u);
         addTestComponent(formLayout);
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java b/uitest/src/main/java/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java
index 299195d266..f2b076b60a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java
@@ -44,7 +44,7 @@ public class TestUploadAndDisableOnSuccess extends ComponentTestCase<Upload>
 
         final Upload u;
         u = new Upload(null, this);
-        u.setImmediate(true);
+        u.setImmediateMode(true);
         addTestComponent(u);
 
         l = new Label(getUploadcount());
diff --git a/uitest/src/main/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java
index ce866c37ba..9b5de2ed51 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java
@@ -44,7 +44,7 @@ public class UploadImmediateButtonWidth extends AbstractReindeerTestUI {
 
         upload.setId(id);
         upload.setWidth(width);
-        upload.setImmediate(true);
+        upload.setImmediateMode(true);
 
         return upload;
     }
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ImmediateUpload.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ImmediateUpload.java
index 7c6df0e990..30f472114e 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ImmediateUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ImmediateUpload.java
@@ -35,14 +35,14 @@ public class ImmediateUpload extends AbstractTestUI {
     @Override
     protected void setup(VaadinRequest request) {
 
+        // by default is not in immediate mode
         Upload upload = new Upload();
         upload.setId("upload");
-        upload.setImmediate(false);
         addComponent(upload);
 
         Upload immediateUpload = new Upload();
         immediateUpload.setId("immediateupload");
-        immediateUpload.setImmediate(true);
+        immediateUpload.setImmediateMode(true);
         addComponent(immediateUpload);
     }