You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by br...@apache.org on 2003/05/13 13:59:00 UTC
cvs commit: cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/samples InitForm1Action.java
bruno 2003/05/13 04:59:00
Modified: src/blocks/woody/java/org/apache/cocoon/woody
DefaultFormManager.java FormManager.java
src/blocks/woody/java/org/apache/cocoon/woody/acting
HandleFormSubmitAction.java MakeFormAction.java
src/blocks/woody/java/org/apache/cocoon/woody/samples
InitForm1Action.java
Log:
Replaced FormManager.getFormDefinition() with FormManager.createForm()
Revision Changes Path
1.2 +4 -0 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/DefaultFormManager.java
Index: DefaultFormManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/DefaultFormManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultFormManager.java 22 Apr 2003 12:04:18 -0000 1.1
+++ DefaultFormManager.java 13 May 2003 11:59:00 -0000 1.2
@@ -121,6 +121,10 @@
initialized = true;
}
+ public Form createForm(Source source) throws Exception {
+ return (Form)getFormDefinition(source).createInstance();
+ }
+
public FormDefinition getFormDefinition(Source source) throws Exception {
lazyInitialize();
1.2 +2 -1 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/FormManager.java
Index: FormManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/FormManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FormManager.java 22 Apr 2003 12:04:18 -0000 1.1
+++ FormManager.java 13 May 2003 11:59:00 -0000 1.2
@@ -52,6 +52,7 @@
import org.apache.cocoon.woody.formmodel.FormDefinition;
import org.apache.cocoon.woody.formmodel.WidgetDefinition;
+import org.apache.cocoon.woody.formmodel.Form;
import org.apache.excalibur.source.Source;
import org.w3c.dom.Element;
@@ -61,7 +62,7 @@
public interface FormManager {
public static final String ROLE = "org.apache.cocoon.woody.FormManager";
- public FormDefinition getFormDefinition(Source source) throws Exception;
+ public Form createForm(Source source) throws Exception;
public WidgetDefinition buildWidgetDefinition(Element widgetDefinition) throws Exception;
}
1.2 +2 -9 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/acting/HandleFormSubmitAction.java
Index: HandleFormSubmitAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/acting/HandleFormSubmitAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HandleFormSubmitAction.java 22 Apr 2003 12:04:18 -0000 1.1
+++ HandleFormSubmitAction.java 13 May 2003 11:59:00 -0000 1.2
@@ -80,21 +80,14 @@
* <li><strong>attribute-name</strong>: name of the request attribute in which the form instance should be stored
* </ul>
*/
-public class HandleFormSubmitAction implements Action, ThreadSafe, Composable {
-
- FormManager formManager;
-
- public void compose(ComponentManager componentManager) throws ComponentException {
- formManager = (FormManager)componentManager.lookup(FormManager.ROLE);
- }
+public class HandleFormSubmitAction extends AbstractWoodyAction implements Action, ThreadSafe, Composable {
public Map act(Redirector redirector, SourceResolver resolver, Map objectModel, String source, Parameters parameters)
throws Exception {
String formSource = parameters.getParameter("form-definition");
String formAttribute = parameters.getParameter("attribute-name");
- FormDefinition formDefinition = formManager.getFormDefinition(resolver.resolveURI(formSource));
- Form form = (Form)formDefinition.createInstance();
+ Form form = formManager.createForm(resolver.resolveURI(formSource));
Request request = ObjectModelHelper.getRequest(objectModel);
form.readFromRequest(request, Locale.US);
1.2 +1 -2 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/acting/MakeFormAction.java
Index: MakeFormAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/acting/MakeFormAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MakeFormAction.java 22 Apr 2003 12:04:18 -0000 1.1
+++ MakeFormAction.java 13 May 2003 11:59:00 -0000 1.2
@@ -88,8 +88,7 @@
String formSource = parameters.getParameter("form-definition");
String formAttribute = parameters.getParameter("attribute-name");
- FormDefinition formDefinition = formManager.getFormDefinition(resolver.resolveURI(formSource));
- Form form = (Form)formDefinition.createInstance();
+ Form form = formManager.createForm(resolver.resolveURI(formSource));
Request request = ObjectModelHelper.getRequest(objectModel);
request.setAttribute(formAttribute, form);
1.2 +1 -2 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/samples/InitForm1Action.java
Index: InitForm1Action.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/samples/InitForm1Action.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InitForm1Action.java 22 Apr 2003 12:04:21 -0000 1.1
+++ InitForm1Action.java 13 May 2003 11:59:00 -0000 1.2
@@ -74,8 +74,7 @@
String formSource = parameters.getParameter("form-definition");
String formAttribute = parameters.getParameter("attribute-name");
- FormDefinition formDefinition = formManager.getFormDefinition(resolver.resolveURI(formSource));
- Form form = (Form)formDefinition.createInstance();
+ Form form = formManager.createForm(resolver.resolveURI(formSource));
Repeater repeater = (Repeater)form.getWidget("contacts");
repeater.addRow();