dflorey 2004/05/11 03:07:33
Modified: proposals/projector/src/java/org/apache/slide/projector/engine
Test.java
proposals/projector/src/java/org/apache/slide/projector/processor/form
FormHandler.java
Added: proposals/projector/src/java/org/apache/slide/projector/processor/form
ClearForm.java
Removed: proposals/projector/src/java/org/apache/slide/projector/processor
ClearForm.java
Log:
Improved form handling
Revision Changes Path
1.2 +2 -0
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Test.java
Index: Test.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Test.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Test.java 10 May 2004 16:54:24 -0000 1.1
+++ Test.java 11 May 2004 10:07:33 -0000 1.2
@@ -19,6 +19,7 @@
import org.apache.slide.projector.processor.form.Control;
import org.apache.slide.projector.processor.form.ControlComposer;
import org.apache.slide.projector.processor.form.FormGenerator;
+import org.apache.slide.projector.resource.BooleanResource;
import org.apache.slide.projector.resource.MapResource;
import org.apache.slide.projector.resource.NullResource;
import org.apache.slide.projector.resource.StringResource;
@@ -69,6 +70,7 @@
Result processorResult = processor.process(parameter, context);
if ( hasErrors(context.getInformations()) ) {
context.setStep(FORM_STEP);
+
((HttpContext.FormStore)context.getStore(Store.FORM)).put(ControlComposer.VALIDATE,
BooleanResource.TRUE);
result = formProcessor.process(parameter, context);
} else {
Map resultParameters = new HashMap();
1.8 +3 -2
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/FormHandler.java
Index: FormHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/FormHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FormHandler.java 10 May 2004 16:54:24 -0000 1.7
+++ FormHandler.java 11 May 2004 10:07:33 -0000 1.8
@@ -66,7 +66,7 @@
// 2. Validate parameters
Processor processor =
ProcessorManager.getInstance().getProcessor(actionURI);
try {
- // validate only given parameters to enable wizard like forms
+ // Validate only given parameters to enable wizard like forms
ParameterDescriptor[] parameterDescriptors =
processor.getParameterDescriptors();
for ( int i = 0; i < parameterDescriptors.length; i++ ) {
String parameterName = parameterDescriptors[i].getName();
@@ -74,6 +74,7 @@
map.put(parameterName,
ProcessorHelper.validate(parameterDescriptors[i], parameter.get(parameterName),
context));
}
}
+ // Don't validate target step form
map.put(ControlComposer.VALIDATE, BooleanResource.FALSE);
} catch ( ValidationException exception ) {
// 3. Go back to form step if validation failes
1.1
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/ClearForm.java
Index: ClearForm.java
===================================================================
package org.apache.slide.projector.processor.form;
import java.util.Map;
import org.apache.slide.projector.Context;
import org.apache.slide.projector.Processor;
import org.apache.slide.projector.Result;
import org.apache.slide.projector.Store;
import org.apache.slide.projector.descriptor.ParameterDescriptor;
import org.apache.slide.projector.descriptor.ResultDescriptor;
import org.apache.slide.projector.descriptor.StateDescriptor;
import org.apache.slide.projector.engine.HttpContext;
public class ClearForm implements Processor {
public Result process(Map parameter, Context context) throws Exception {
Store formStore = context.getStore(Store.FORM);
if ( formStore != null ) {
((HttpContext.FormStore)formStore).clear();
}
return new Result(StateDescriptor.OK);
}
public ParameterDescriptor[] getParameterDescriptors() {
return ParameterDescriptor.NO_PARAMETERS;
}
public ResultDescriptor getResultDescriptor() {
return ResultDescriptor.OK;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
