You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by df...@apache.org on 2004/08/11 15:19:30 UTC
cvs commit: jakarta-slide/projector/src/java/org/apache/slide/projector/processor/form Form.java ControlComposer.java
dflorey 2004/08/11 06:19:30
Modified: projector/src/java/org/apache/slide/projector/processor/form
Form.java ControlComposer.java
Log:
Moved locale form parameter to environment
Revision Changes Path
1.5 +5 -7 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/form/Form.java
Index: Form.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/form/Form.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Form.java 3 Aug 2004 14:29:56 -0000 1.4
+++ Form.java 11 Aug 2004 13:19:30 -0000 1.5
@@ -38,7 +38,6 @@
import org.apache.slide.projector.URI;
import org.apache.slide.projector.descriptor.AnyValueDescriptor;
import org.apache.slide.projector.descriptor.BooleanValueDescriptor;
-import org.apache.slide.projector.descriptor.LocaleValueDescriptor;
import org.apache.slide.projector.descriptor.MapValueDescriptor;
import org.apache.slide.projector.descriptor.ParameterDescriptor;
import org.apache.slide.projector.descriptor.ResultDescriptor;
@@ -86,8 +85,8 @@
}
Object a = parameter.get(ACTION);
URI actionUri = (URI)a;
- Locale locale = ((LocaleValue)parameter.get(LOCALE)).getLocale();
- List informations = context.getInformations();
+ Locale locale = ((LocaleValue)context.getStore(Store.SESSION).get(LOCALE)).getLocale();
+ List informations = context.getInformations();
parameter.put(HANDLER, ProcessorManager.getInstance().process(ProcessorManager.URL, parameter.get(HANDLER), context));
List controlDescriptions = new ArrayList();
List triggerDescriptions = new ArrayList();
@@ -165,7 +164,6 @@
}
parameterList.add(new ParameterDescriptor(HANDLER, new ParameterMessage("form/handler"), new URIValueDescriptor(), Constants.DEFAULT_FORM_HANDLER));
parameterList.add(new ParameterDescriptor(METHOD, new ParameterMessage("form/method"), new StringValueDescriptor(methods), new StringValue(POST)));
- parameterList.add(new ParameterDescriptor(LOCALE, new ParameterMessage("form/locale"), new LocaleValueDescriptor()));
parameterList.add(new ParameterDescriptor(ACTION, new ParameterMessage("form/action"), new URIValueDescriptor()));
parameterDescriptors = (ParameterDescriptor[])parameterList.toArray(new ParameterDescriptor[parameterList.size()]);
}
1.5 +14 -6 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/form/ControlComposer.java
Index: ControlComposer.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/form/ControlComposer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ControlComposer.java 3 Aug 2004 14:29:56 -0000 1.4
+++ ControlComposer.java 11 Aug 2004 13:19:30 -0000 1.5
@@ -9,6 +9,7 @@
import org.apache.slide.projector.ConfigurationException;
import org.apache.slide.projector.Context;
+import org.apache.slide.projector.EnvironmentConsumer;
import org.apache.slide.projector.Information;
import org.apache.slide.projector.ProcessException;
import org.apache.slide.projector.Processor;
@@ -20,6 +21,7 @@
import org.apache.slide.projector.descriptor.LocaleValueDescriptor;
import org.apache.slide.projector.descriptor.MapValueDescriptor;
import org.apache.slide.projector.descriptor.ParameterDescriptor;
+import org.apache.slide.projector.descriptor.RequiredEnvironmentDescriptor;
import org.apache.slide.projector.descriptor.ResultDescriptor;
import org.apache.slide.projector.descriptor.ResultEntryDescriptor;
import org.apache.slide.projector.descriptor.StateDescriptor;
@@ -49,7 +51,7 @@
* The ControlComposer class
*
*/
-public class ControlComposer extends TemplateRenderer {
+public class ControlComposer extends TemplateRenderer implements EnvironmentConsumer {
// Parameters for the control composer
public final static String VALIDATE = "validate";
public final static String LOCALE = "locale";
@@ -126,10 +128,14 @@
new ResultEntryDescriptor(RENDERED_ERRORS, new DefaultMessage("controlComposer/renderedErrors"), MapValue.CONTENT_TYPE, false)
});
+ private final static RequiredEnvironmentDescriptor[] requiredEnvironmentDescriptors = new RequiredEnvironmentDescriptor[] {
+ new RequiredEnvironmentDescriptor(LOCALE, Store.SESSION, new DefaultMessage("treeLocalized/requiredEnvironment/locale"), new LocaleValueDescriptor(), new LocaleValue(Locale.getDefault()))
+ };
+
public void configure(StreamableValue config) throws ConfigurationException {
super.configure(config);
ParameterDescriptor[] parentParameterDescriptors = super.getParameterDescriptors();
- parameterDescriptors = new ParameterDescriptor[parentParameterDescriptors.length + 5];
+ parameterDescriptors = new ParameterDescriptor[parentParameterDescriptors.length + 4];
System.arraycopy(parentParameterDescriptors, 0, parameterDescriptors, 0, parentParameterDescriptors.length);
parameterDescriptors[parentParameterDescriptors.length] =
new ParameterDescriptor(CONTROL_DESCRIPTIONS, new ParameterMessage("controlComposer/controlDescriptions"), new ArrayValueDescriptor(
@@ -149,10 +155,8 @@
new ParameterDescriptor(TRIGGER_CONTAINER, new ParameterMessage("controlComposer/triggerDescriptions/triggerContainer"), new URIValueDescriptor(), NullValue.NULL)
})));
parameterDescriptors[parentParameterDescriptors.length+2] =
- new ParameterDescriptor(LOCALE, new ParameterMessage("controlComposer/locale"), new LocaleValueDescriptor());
- parameterDescriptors[parentParameterDescriptors.length+3] =
new ParameterDescriptor(ACTION, new ParameterMessage("controlComposer/action"), new URIValueDescriptor());
- parameterDescriptors[parentParameterDescriptors.length+4] =
+ parameterDescriptors[parentParameterDescriptors.length+3] =
new ParameterDescriptor(ERRORS_PROCESSOR, new ParameterMessage("controlComposer/errorsProcessor"), new URIValueDescriptor(), NullValue.NULL);
try {
@@ -169,7 +173,7 @@
Value[] triggerDescriptions = ((ArrayValue)parameter.get(TRIGGER_DESCRIPTIONS)).getArray();
URI actionUri = (URIValue)parameter.get(ACTION);
Value errorsProcessorUri = (Value)parameter.get(ERRORS_PROCESSOR);
- Locale locale = ((LocaleValue)parameter.get(LOCALE)).getLocale();
+ Locale locale = ((LocaleValue)context.getStore(Store.SESSION).get(LOCALE)).getLocale();
String state = DEFAULT_STATE;
List informations = context.getInformations();
MapValue mapResource = (MapValue)((FormStore)context.getStore(Store.FORM)).getDomain();
@@ -373,6 +377,10 @@
public ParameterDescriptor[] getParameterDescriptors() {
return parameterDescriptors;
}
+
+ public RequiredEnvironmentDescriptor[] getRequiredEnvironmentDescriptors() {
+ return requiredEnvironmentDescriptors;
+ }
public ResultDescriptor getResultDescriptor() {
return resultDescriptor;
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org