Remove auto binding from examples CLK-742
git-svn-id: https://svn.apache.org/repos/asf/click/trunk/click@1052834 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/examples/src/org/apache/click/examples/page/introduction/AdvancedForm.java b/examples/src/org/apache/click/examples/page/introduction/AdvancedForm.java
index 180419e..bed1ea4 100644
--- a/examples/src/org/apache/click/examples/page/introduction/AdvancedForm.java
+++ b/examples/src/org/apache/click/examples/page/introduction/AdvancedForm.java
@@ -37,7 +37,6 @@
import org.apache.click.examples.service.CustomerService;
import org.apache.click.extras.control.DateField;
import org.apache.click.extras.control.EmailField;
-import org.apache.click.util.Bindable;
import org.springframework.stereotype.Component;
/**
@@ -48,8 +47,7 @@
private static final long serialVersionUID = 1L;
- @Bindable protected Form form = new Form();
- @Bindable protected String msg;
+ private Form form = new Form("form");
private Select investmentSelect = new Select("investments");
@@ -59,6 +57,8 @@
// Constructor ------------------------------------------------------------
public AdvancedForm() {
+ addControl(form);
+
FieldSet fieldSet = new FieldSet("Customer");
form.add(fieldSet);
@@ -114,7 +114,8 @@
form.clearValues();
- msg = "A new customer record has been created.";
+ String msg = "A new customer record has been created.";
+ addModel("msg", msg);
}
return true;
}
diff --git a/examples/src/org/apache/click/examples/page/introduction/AdvancedTable.java b/examples/src/org/apache/click/examples/page/introduction/AdvancedTable.java
index 81d1cbd..e2ef2dc 100644
--- a/examples/src/org/apache/click/examples/page/introduction/AdvancedTable.java
+++ b/examples/src/org/apache/click/examples/page/introduction/AdvancedTable.java
@@ -32,7 +32,6 @@
import org.apache.click.examples.page.EditCustomer;
import org.apache.click.examples.service.CustomerService;
import org.apache.click.extras.control.LinkDecorator;
-import org.apache.click.util.Bindable;
import org.apache.click.dataprovider.DataProvider;
/**
@@ -45,9 +44,9 @@
private static final long serialVersionUID = 1L;
- @Bindable protected Table table = new Table();
- @Bindable protected PageLink editLink = new PageLink("Edit", EditCustomer.class);
- @Bindable protected ActionLink deleteLink = new ActionLink("Delete", this, "onDeleteClick");
+ private Table table = new Table("table");
+ private PageLink editLink = new PageLink("Edit", EditCustomer.class);
+ private ActionLink deleteLink = new ActionLink("Delete", this, "onDeleteClick");
/**
* Spring injected CustomerService bean. The service is marked as transient
@@ -59,6 +58,12 @@
// Constructor ------------------------------------------------------------
public AdvancedTable() {
+ // Add controls
+ addControl(table);
+ addControl(editLink);
+ addControl(deleteLink);
+
+ // Setup table
table.setClass(Table.CLASS_ITS);
table.setPageSize(10);
table.setShowBanner(true);
@@ -98,22 +103,9 @@
return getCustomerService().getCustomers();
}
});
- }
- // Event Handlers ---------------------------------------------------------
-
- public boolean onDeleteClick() {
- Integer id = deleteLink.getValueInteger();
- getCustomerService().deleteCustomer(id);
- return true;
- }
-
- @Override
- public void onInit() {
- super.onInit();
-
- // Restore the table sort and paging state from the session
- table.restoreState(getContext());
+ // Below we setup the table to preserve it's state (sorting and paging)
+ // while editing customers
table.getControlLink().setActionListener(new ActionListener() {
@@ -127,6 +119,17 @@
return true;
}
});
+
+ // Restore the table sort and paging state from the session between requests
+ table.restoreState(getContext());
+ }
+
+ // Event Handlers ---------------------------------------------------------
+
+ public boolean onDeleteClick() {
+ Integer id = deleteLink.getValueInteger();
+ getCustomerService().deleteCustomer(id);
+ return true;
}
// Public Methods ---------------------------------------------------------
diff --git a/examples/src/org/apache/click/examples/page/introduction/SimpleForm.java b/examples/src/org/apache/click/examples/page/introduction/SimpleForm.java
index 5a2a17e..159d009 100644
--- a/examples/src/org/apache/click/examples/page/introduction/SimpleForm.java
+++ b/examples/src/org/apache/click/examples/page/introduction/SimpleForm.java
@@ -22,7 +22,6 @@
import org.apache.click.control.Submit;
import org.apache.click.control.TextField;
import org.apache.click.examples.page.BorderPage;
-import org.apache.click.util.Bindable;
/**
* Provides a simple Form example Page.
@@ -38,12 +37,13 @@
private static final long serialVersionUID = 1L;
- @Bindable protected Form form = new Form();
- @Bindable protected String msg;
+ private Form form = new Form("form");
// Constructor ------------------------------------------------------------
public SimpleForm() {
+ addControl(form);
+
form.add(new TextField("name", true));
form.add(new Submit("OK"));
@@ -57,7 +57,8 @@
*/
public boolean onSubmit() {
if (form.isValid()) {
- msg = "Your name is " + form.getFieldValue("name");
+ String msg = "Your name is " + form.getFieldValue("name");
+ addModel("msg", msg);
}
return true;
}
