Remove auto binding from examples CLK-742
git-svn-id: https://svn.apache.org/repos/asf/click/trunk/click@1052769 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/examples/src/org/apache/click/examples/page/control/LinkDemo.java b/examples/src/org/apache/click/examples/page/control/LinkDemo.java
index d72d0a7..20bc8d2 100644
--- a/examples/src/org/apache/click/examples/page/control/LinkDemo.java
+++ b/examples/src/org/apache/click/examples/page/control/LinkDemo.java
@@ -26,7 +26,6 @@
import org.apache.click.examples.page.HomePage;
import org.apache.click.extras.control.ExternalLink;
import org.apache.click.extras.control.PageButton;
-import org.apache.click.util.Bindable;
/**
* Provides an ActionLink, ExternalLink and PageLink control examples Page.
@@ -35,26 +34,37 @@
private static final long serialVersionUID = 1L;
- @Bindable protected ActionLink actionLink = new ActionLink("ActionLink", this, "onLinkClick");
- @Bindable protected ActionLink disabledActionLink = new ActionLink("DisabledActionLink", this, "onLinkClick");
- @Bindable protected ActionLink iconActionLink = new ActionLink("IconActionLink", this, "onLinkClick");
- @Bindable protected ActionLink disabledIconActionLink = new ActionLink("DisabledIconActionLink", this, "onLinkClick");
+ private ActionLink actionLink = new ActionLink("ActionLink", this, "onLinkClick");
+ private ActionLink disabledActionLink = new ActionLink("DisabledActionLink", this, "onLinkClick");
+ private ActionLink iconActionLink = new ActionLink("IconActionLink", this, "onLinkClick");
+ private ActionLink disabledIconActionLink = new ActionLink("DisabledIconActionLink", this, "onLinkClick");
- @Bindable protected PageLink pageLink = new PageLink("PageLink", HomePage.class);
- @Bindable protected PageLink disabledPageLink = new PageLink("DisabledPageLink", HomePage.class);
- @Bindable protected PageLink iconPageLink = new PageLink("IconPageLink",HomePage.class);
- @Bindable protected PageLink disabledIconPageLink = new PageLink("DisabledIconPageLink",HomePage.class);
+ private PageLink pageLink = new PageLink("PageLink", HomePage.class);
+ private PageLink disabledPageLink = new PageLink("DisabledPageLink", HomePage.class);
+ private PageLink iconPageLink = new PageLink("IconPageLink",HomePage.class);
+ private PageLink disabledIconPageLink = new PageLink("DisabledIconPageLink",HomePage.class);
- @Bindable protected PageButton pageButton = new PageButton("PageButton", HomePage.class);
- @Bindable protected PageButton disabledPageButton = new PageButton("DisabledPageButton", HomePage.class);
- @Bindable protected ExternalLink externalLink = new ExternalLink("ExternalLink", "http://www.google.com/search");
- @Bindable protected ExternalLink disabledExternalLink = new ExternalLink("DisabledExternalLink", "http://www.google.com/search");
-
- @Bindable protected String clicked;
+ private PageButton pageButton = new PageButton("PageButton", HomePage.class);
+ private PageButton disabledPageButton = new PageButton("DisabledPageButton", HomePage.class);
+ private ExternalLink externalLink = new ExternalLink("ExternalLink", "http://www.google.com/search");
+ private ExternalLink disabledExternalLink = new ExternalLink("DisabledExternalLink", "http://www.google.com/search");
// Constructor ------------------------------------------------------------
public LinkDemo() {
+ addControl(actionLink);
+ addControl(disabledActionLink);
+ addControl(iconActionLink);
+ addControl(disabledIconActionLink);
+ addControl(pageLink);
+ addControl(disabledPageLink);
+ addControl(iconPageLink);
+ addControl(disabledIconPageLink);
+ addControl(pageButton);
+ addControl(disabledPageButton);
+ addControl(externalLink);
+ addControl(disabledExternalLink);
+
iconActionLink.setRenderLabelAndImage(true);
iconActionLink.addStyleClass("image-link");
iconActionLink.setImageSrc("/assets/images/table-edit.png");
@@ -90,7 +100,8 @@
// Event Handlers ---------------------------------------------------------
public boolean onLinkClick() {
- clicked = getClass().getName() + ".onLinkClick invoked at " + (new Date());
+ String msg = getClass().getName() + ".onLinkClick invoked at " + (new Date());
+ addModel("msg", msg);
return true;
}
diff --git a/examples/src/org/apache/click/examples/page/control/PickListDemo.java b/examples/src/org/apache/click/examples/page/control/PickListDemo.java
index 0ad1c42..2d671d4 100644
--- a/examples/src/org/apache/click/examples/page/control/PickListDemo.java
+++ b/examples/src/org/apache/click/examples/page/control/PickListDemo.java
@@ -25,7 +25,6 @@
import org.apache.click.control.Submit;
import org.apache.click.examples.page.BorderPage;
import org.apache.click.extras.control.PickList;
-import org.apache.click.util.Bindable;
/**
* Provides an Select example Page.
@@ -34,14 +33,15 @@
private static final long serialVersionUID = 1L;
- @Bindable protected Form form = new Form();
- @Bindable protected List selectedValues;
+ private Form form = new Form("form");
private PickList pickList = new PickList("languages");
// Constructor ------------------------------------------------------------
public PickListDemo() {
+ addControl(form);
+
pickList.setHeaderLabel("Languages", "Selected");
pickList.add(new Option("002", "C/C++"));
@@ -63,7 +63,8 @@
// Event Handlers ---------------------------------------------------------
public boolean onOkClick() {
- selectedValues = pickList.getSelectedValues();
+ List selectedValues = pickList.getSelectedValues();
+ addModel("selectedValues", selectedValues);
return true;
}
diff --git a/examples/src/org/apache/click/examples/page/control/RegexDemo.java b/examples/src/org/apache/click/examples/page/control/RegexDemo.java
index 4729c1f..5e7f929 100644
--- a/examples/src/org/apache/click/examples/page/control/RegexDemo.java
+++ b/examples/src/org/apache/click/examples/page/control/RegexDemo.java
@@ -24,7 +24,6 @@
import org.apache.click.examples.page.HomePage;
import org.apache.click.extras.control.PageSubmit;
import org.apache.click.extras.control.RegexField;
-import org.apache.click.util.Bindable;
/**
* Provides a form RegexField example.
@@ -33,9 +32,11 @@
private static final long serialVersionUID = 1L;
- @Bindable protected Form form = new Form();
+ private Form form = new Form("form");
public RegexDemo() {
+ addControl(form);
+
RegexField versionField = new RegexField("version", "Version", 10);
versionField.setPattern("[0-9]+\\.[0-9]+\\.[0-9]+");
versionField.setRequired(true);
diff --git a/examples/src/org/apache/click/examples/page/control/SelectDemo.java b/examples/src/org/apache/click/examples/page/control/SelectDemo.java
index fa1b0bd..68138c7 100644
--- a/examples/src/org/apache/click/examples/page/control/SelectDemo.java
+++ b/examples/src/org/apache/click/examples/page/control/SelectDemo.java
@@ -31,7 +31,6 @@
import org.apache.click.examples.page.HomePage;
import org.apache.click.extras.control.CountrySelect;
import org.apache.click.extras.control.PageSubmit;
-import org.apache.click.util.Bindable;
/**
* Provides an Select example Page.
@@ -40,7 +39,7 @@
private static final long serialVersionUID = 1L;
- @Bindable protected Form form = new Form();
+ private Form form = new Form("form");
private Select genderSelect;
private Select investmentSelect;
@@ -51,6 +50,7 @@
@SuppressWarnings("unchecked")
public SelectDemo() {
+ addControl(form);
form.setErrorsPosition(Form.POSITION_TOP);
// Gender Select - populated through a DataProvider
diff --git a/examples/src/org/apache/click/examples/page/control/SubmitLinkDemo.java b/examples/src/org/apache/click/examples/page/control/SubmitLinkDemo.java
index ca1e9f9..0bc2e78 100644
--- a/examples/src/org/apache/click/examples/page/control/SubmitLinkDemo.java
+++ b/examples/src/org/apache/click/examples/page/control/SubmitLinkDemo.java
@@ -27,7 +27,6 @@
import org.apache.click.control.TextField;
import org.apache.click.examples.page.BorderPage;
import org.apache.click.extras.control.SubmitLink;
-import org.apache.click.util.Bindable;
/**
* This example demonstrates how to use a SubmitLink control together with the
@@ -37,14 +36,6 @@
private static final long serialVersionUID = 1L;
- @Bindable protected String demo1Msg;
-
- @Bindable protected String demo2Msg;
-
- @Bindable protected String demo3Msg;
-
- @Bindable protected String demo4Msg;
-
// Constructor ------------------------------------------------------------
public SubmitLinkDemo() {
@@ -78,8 +69,9 @@
submitLink.setActionListener(new ActionListener() {
public boolean onAction(Control source) {
- demo1Msg = submitLink.getName() + ".onAction invoked at "
+ String demo1Msg = submitLink.getName() + ".onAction invoked at "
+ (new Date());
+ addModel("demo1Msg", demo1Msg);
return true;
}
});
@@ -108,9 +100,10 @@
paramLink.setActionListener(new ActionListener() {
public boolean onAction(Control source) {
- demo2Msg = paramLink.getName() + ".onAction invoked at "
+ String demo2Msg = paramLink.getName() + ".onAction invoked at "
+ (new Date());
demo2Msg += "<br>Parameters:" + paramLink.getParameters();
+ addModel("demo2Msg", demo2Msg);
return true;
}
});
@@ -127,8 +120,9 @@
standaloneLink.setActionListener(new ActionListener() {
public boolean onAction(Control source) {
- demo3Msg = source.getName() + ".onAction invoked at " +
+ String demo3Msg = source.getName() + ".onAction invoked at " +
(new Date());
+ addModel("demo3Msg", demo3Msg);
return true;
}
});
@@ -158,8 +152,9 @@
confirmationLink.setActionListener(new ActionListener() {
public boolean onAction(Control source) {
- demo4Msg = confirmationLink.getName() + ".onAction invoked at "
+ String demo4Msg = confirmationLink.getName() + ".onAction invoked at "
+ (new Date());
+ addModel("demo4Msg", demo4Msg);
return true;
}
});
