Author: simoneg
Date: Thu Dec 17 11:15:13 2009
New Revision: 891637
URL: http://svn.apache.org/viewvc?rev=891637&view=rev
Log:
Fix for head in form pieces
Modified:
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/htmlpieces/HtmlFormPiece.java
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java
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/htmlpieces/AbstractSelectionHtmlFormPiece.java
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/htmlpieces/BooleanHtmlFormPiece.java
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/htmlpieces/SelectionHtmlFormPiece.java
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/htmlpieces/TextFieldHtmlFormPiece.java
Modified:
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/htmlpieces/HtmlFormPiece.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/htmlpieces/HtmlFormPiece.java?rev=891637&r1=891636&r2=891637&view=diff
==============================================================================
---
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/htmlpieces/HtmlFormPiece.java
(original)
+++
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/htmlpieces/HtmlFormPiece.java
Thu Dec 17 11:15:13 2009
@@ -21,6 +21,7 @@
import org.apache.commons.beanutils.Converter;
import org.apache.magma.i18n.Formatter;
+import org.apache.magma.website.Head;
/**
* Outputs a form input for a specific type.
@@ -75,7 +76,7 @@
* @param id The id of the form field
* @param head The head object to add scripts and CSS
*/
- public void formHead(T value, String id);
+ public void formHead(T value, String id, Head head);
/**
* Creates a form input.
Modified:
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java?rev=891637&r1=891636&r2=891637&view=diff
==============================================================================
---
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java
(original)
+++
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java
Thu Dec 17 11:15:13 2009
@@ -30,7 +30,9 @@
import org.apache.magma.view.tree.Node;
import org.apache.magma.view.tree.PropertyNode;
import org.apache.magma.view.tree.ViewUtils;
+import org.apache.magma.website.Head;
import org.apache.magma.website.htmlpieces.HtmlFormPiece;
+import org.apache.magma.website.htmlpieces.HtmlOutputPiece;
import java.io.IOException;
import java.io.OutputStream;
@@ -42,6 +44,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.apache.magma.conversion.Converter;
import org.apache.magma.conversion.string.BooleanConverter;
@@ -68,6 +71,31 @@
}
@Override
+ public void head(Head head) {
+ head.addCss("magma:/common/beansview/magmaBeansview.css");
+ if (beanStyle != null) {
+ beanStyle.head(head);
+ }
+ root = bean.beanData().getViewTree(this.layers);
+ Set<Node> nodes = root.getAllNodes();
+ for (Node node : nodes) {
+ if (node instanceof FieldNode) {
+ FieldNode propnode = (FieldNode) node;
+ PropertyInfo property = propnode.getProperty();
+ if (!property.isWriteable()) {
+ HtmlOutputPiece piece =
property.getHtmlOutputPiece();
+ Object value =
ViewUtils.getNodeValue(propnode, bean);
+ piece.head(value, head);
+ } else {
+ HtmlFormPiece piece =
property.getHtmlFormPiece();
+ Object value =
ViewUtils.getNodeValue(propnode, bean);
+ piece.formHead(value, this.code + "." +
node.getId(), head);
+ }
+ }
+ }
+ }
+
+ @Override
public void produce(Writer out) throws IOException {
try {
if (beanStyle == null) {
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=891637&r1=891636&r2=891637&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
Thu Dec 17 11:15:13 2009
@@ -60,19 +60,20 @@
}
}
- public void BeanFormProducer.head(Head head) {
- super.head(head);
- if (this.autoSubmit == null) return;
+ after(BeanFormProducer p, Head head) :
+ execution(public void BeanFormProducer.head(Head)) &&
+ args(head) && this (p) {
+ if (p.autoSubmit == null) return;
head.addExternalScript("formsSupport.js");
StringWriter writer = new StringWriter();
writer.append("\nfunction initForm() {\n");
- for (String nodeid : this.autoSubmit) {
+ for (String nodeid : p.autoSubmit) {
writer.append("goAutosubmit('");
writer.append(nodeid);
writer.append("');\n");
}
writer.append(" }\n");
- head.addRawScript(this.getCompletePath() + ":initForm",
writer.toString());
+ head.addRawScript(p.getCompletePath() + ":initForm",
writer.toString());
head.addDoOnload("initForm");
}
Modified:
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/htmlpieces/AbstractSelectionHtmlFormPiece.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/htmlpieces/AbstractSelectionHtmlFormPiece.java?rev=891637&r1=891636&r2=891637&view=diff
==============================================================================
---
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/htmlpieces/AbstractSelectionHtmlFormPiece.java
(original)
+++
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/htmlpieces/AbstractSelectionHtmlFormPiece.java
Thu Dec 17 11:15:13 2009
@@ -98,8 +98,8 @@
}
-
- public void formHead(T value, String id) {
+ public void formHead(T value, String id,
org.apache.magma.website.Head head) {
+
}
}
Modified:
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/htmlpieces/BooleanHtmlFormPiece.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/htmlpieces/BooleanHtmlFormPiece.java?rev=891637&r1=891636&r2=891637&view=diff
==============================================================================
---
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/htmlpieces/BooleanHtmlFormPiece.java
(original)
+++
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/htmlpieces/BooleanHtmlFormPiece.java
Thu Dec 17 11:15:13 2009
@@ -2,6 +2,7 @@
import org.apache.magma.basics.LocalizableString;
import org.apache.magma.view.tree.ViewUtils;
+import org.apache.magma.website.Head;
public class BooleanHtmlFormPiece implements HtmlFormPiece<Boolean> {
@@ -61,7 +62,7 @@
}
}
- public void formHead(Boolean value, String id) {
+ public void formHead(Boolean value, String id, Head head) {
}
public boolean handles(Class<?> clazz) {
Modified:
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/htmlpieces/SelectionHtmlFormPiece.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/htmlpieces/SelectionHtmlFormPiece.java?rev=891637&r1=891636&r2=891637&view=diff
==============================================================================
---
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/htmlpieces/SelectionHtmlFormPiece.java
(original)
+++
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/htmlpieces/SelectionHtmlFormPiece.java
Thu Dec 17 11:15:13 2009
@@ -59,9 +59,6 @@
return ret;
}
- public void formHead(MagmaBeanSupport value, String id) {
- }
-
public boolean handles(Class<?> clazz) {
return MagmaBeanSupport.class.isAssignableFrom(clazz);
}
Modified:
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/htmlpieces/TextFieldHtmlFormPiece.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/htmlpieces/TextFieldHtmlFormPiece.java?rev=891637&r1=891636&r2=891637&view=diff
==============================================================================
---
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/htmlpieces/TextFieldHtmlFormPiece.java
(original)
+++
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/htmlpieces/TextFieldHtmlFormPiece.java
Thu Dec 17 11:15:13 2009
@@ -9,6 +9,7 @@
import org.apache.magma.view.tree.FieldNode;
import org.apache.magma.view.tree.Node;
import org.apache.magma.view.tree.ViewUtils;
+import org.apache.magma.website.Head;
import static
org.apache.magma.website.htmlpieces.FormHtmlUtils.createNameAndId;
@@ -118,7 +119,7 @@
return ret;
}
- public void formHead(Object value, String id) {
+ public void formHead(Object value, String id, Head head) {
}
public boolean handles(Class<?> clazz) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
