Initial Vaadin 7 upgrade

jbossdemocentral · Dec 21, 2015 · cb12a18 · cb12a18
1 parent 277a5b1
commit cb12a18
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/projects/brms-coolstore-demo/src/main/java/com/redhat/coolstore/web/ui/ProductsView.java b/projects/brms-coolstore-demo/src/main/java/com/redhat/coolstore/web/ui/ProductsView.java
@@ -9,10 +9,10 @@
 import com.redhat.coolstore.model.Product;
 import com.redhat.coolstore.service.ProductService;
 import com.redhat.coolstore.web.CoolStoreApplication;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.event.ShortcutAction.KeyCode;
 import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
@@ -67,16 +67,15 @@ public ProductsView(CoolStoreApplication app) {
 
 			cb.setImmediate(true);
 
-			cb.addListener(new ClickListener() {
+			cb.addValueChangeListener(new ValueChangeListener() {
 
 				@Override
-				public void buttonClick(ClickEvent event) {
+				public void valueChange(ValueChangeEvent event) {
 
 					System.out.println(event);
-
 				}
 			});
-		
+
 			vl.addComponent(cb);
 
 			checkBoxMap.put(product.getName(), cb);
@@ -90,18 +89,18 @@ public void buttonClick(ClickEvent event) {
 		hl.setSpacing(true);
 
 		addToCartButton = new Button("Add To Cart");
-		addToCartButton.addListener((ClickListener) app);		
+		addToCartButton.addListener(app);		
 		addToCartButton.setClickShortcut(KeyCode.ENTER);
 		addToCartButton.setWidth(buttonWidth);
 		hl.addComponent(addToCartButton);
 
 		checkAllButton = new Button("Check All");
-		checkAllButton.addListener((ClickListener) app);
+		checkAllButton.addListener(app);
 		checkAllButton.setWidth(buttonWidth);
 		hl.addComponent(checkAllButton);
 
 		uncheckAllButton = new Button("Uncheck All");
-		uncheckAllButton.addListener((ClickListener) app);
+		uncheckAllButton.addListener(app);
 		uncheckAllButton.setWidth(buttonWidth);
 		hl.addComponent(uncheckAllButton);
 
@@ -111,7 +110,7 @@ public void buttonClick(ClickEvent event) {
 
 		vl.setSpacing(true);
 
-		addComponent(vl);		
+		setContent(vl);
 
 		setSizeFull();
 

diff --git a/projects/brms-coolstore-demo/src/main/java/com/redhat/coolstore/web/ui/ShoppingCartView.java b/projects/brms-coolstore-demo/src/main/java/com/redhat/coolstore/web/ui/ShoppingCartView.java
@@ -6,7 +6,6 @@
 import com.redhat.coolstore.web.CoolStoreApplication;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
@@ -147,13 +146,13 @@ public ShoppingCartView(CoolStoreApplication app) {
 		hl.setSpacing(true);
 
 		checkoutButton = new Button("Checkout");
-		checkoutButton.addListener((ClickListener) app);		
+		checkoutButton.addListener(app);		
 		checkoutButton.setWidth(buttonWidth);
 		checkoutButton.setEnabled(false);
 		hl.addComponent(checkoutButton);
 
 		clearButton = new Button("Clear");
-		clearButton.addListener((ClickListener) app);
+		clearButton.addListener(app);
 		clearButton.setWidth(buttonWidth);
 		hl.addComponent(clearButton);
 
@@ -163,7 +162,7 @@ public ShoppingCartView(CoolStoreApplication app) {
 
 		vl.setSpacing(true);
 
-		addComponent(vl);		
+		setContent(vl);
 
 		setSizeFull();