Author: simoneg
Date: Mon Jun 8 17:10:50 2009
New Revision: 782705
URL: http://svn.apache.org/viewvc?rev=782705&view=rev
Log:
Working of forms event handler
Modified:
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/FormAutoSubmits.aj
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartForm.java
Modified:
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/FormAutoSubmits.aj
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/FormAutoSubmits.aj?rev=782705&r1=782704&r2=782705&view=diff
==============================================================================
---
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/FormAutoSubmits.aj
(original)
+++
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/FormAutoSubmits.aj
Mon Jun 8 17:10:50 2009
@@ -17,20 +17,6 @@
private Set<String> BeanFormProducer.autoSubmit = null;
private boolean SmartForm.goWorking = false;
-
- after(SmartForm form, Map<String, String[]> params) :
- execution(void SmartForm.setAllParams(Map<String, String[]>))
- && this(form) && args(params) {
- form.goWorking = (params.containsKey("magma_working_button"));
- }
-
- HtmlProducer around(SmartForm form) : execution(HtmlProducer
SmartForm.doFilled()) && this(form) {
- if (form.goWorking) {
- return form.doWorking();
- } else {
- return proceed(form);
- }
- }
BeanFormProducer around(SmartForm form) :
call(BeanFormProducer.new(..)) && this(form) {
@@ -47,7 +33,7 @@
if (prod.autoSubmit == null) return;
if (prod.autoSubmit.contains(node.getId())) {
try {
- out.append(" <input
class=\"MagmaRefreshButton\" type=\"submit\" name=\"magma_working_button\"
id=\"working-");
+ out.append(" <input
class=\"MagmaRefreshButton\" type=\"submit\" name=\"magmaWorkingButton\"
id=\"working-");
out.append(node.getId());
out.append("\" value=\"");
out.append(new
LocalizableString("Refresh").toString());
Modified:
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartForm.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartForm.java?rev=782705&r1=782704&r2=782705&view=diff
==============================================================================
---
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartForm.java
(original)
+++
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartForm.java
Mon Jun 8 17:10:50 2009
@@ -53,7 +53,8 @@
private HtmlProducer prodFooter = null;
protected Map<String, String[]> allParams = null;
-
+ private String paramMagmaWorkingButton = null;
+
ViewCustomizer filter = null;
Map<String, List<?>> lists = new HashMap<String, List<?>>();
@@ -128,6 +129,7 @@
}
public HtmlProducer doFilled() {
+ if (paramMagmaWorkingButton != null) return doWorking();
errors.clear();
loadParams();
FormAction action = executeBinding();
@@ -193,13 +195,7 @@
h = properBean.handler();
handlers.put(properBean, h);
}
- String val = binding.get(node.getId());
- String name =
((FieldNode)node).getProperty().getName();
- if (val == null) {
- h.setStringValue(name, null);
- } else {
- h.setFormattedStringValue(name, val);
- }
+ bind(h, node);
}
}
for (int i = 0; i < actions.size(); i++) {
@@ -209,6 +205,16 @@
}
return defaultAction;
}
+
+ protected void bind(BeanHandler h, Node node) {
+ String val = binding.get(node.getId());
+ String name = ((FieldNode)node).getProperty().getName();
+ if (val == null) {
+ h.setStringValue(name, null);
+ } else {
+ h.setFormattedStringValue(name, val);
+ }
+ }
void checkValidity() {
for (BeanHandler handler : handlers.values()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
