dflorey 2004/05/03 08:50:40
Modified: proposals/projector/src/java/org/apache/slide/projector/processor/table
TableHandler.java
proposals/projector/src/java/org/apache/slide/projector/processor/tree
TreeRenderer.java
proposals/projector/src/java/org/apache/slide/projector/processor/form
FormHandler.java
proposals/projector/src/java/org/apache/slide/projector/engine
TestServlet.java
Log:
minor changes
Revision Changes Path
1.2 +4 -5
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/table/TableHandler.java
Index: TableHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/table/TableHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TableHandler.java 3 May 2004 14:20:27 -0000 1.1
+++ TableHandler.java 3 May 2004 15:50:40 -0000 1.2
@@ -47,10 +47,9 @@
tableMap = idResource.getMap();
}
tableMap.put(CURRENT_POSITION, targetPosition);
- StringResource currentProcessor =
(StringResource)context.getStore(Store.SESSION).get(Constants.CURRENT_PROCESSOR_URI);
- if ( currentProcessor != null ) {
- URI currentUri = new URIResource(currentProcessor.toString());
- Processor processor =
ProcessorManager.getInstance().getProcessor(currentUri);
+ URI bookmark = (URI)context.getBookmark();
+ if ( bookmark != null ) {
+ Processor processor =
ProcessorManager.getInstance().getProcessor(bookmark);
ProcessorHelper.validate(processor.getParameterDescriptors(),
parameter, context);
return processor.process(parameter, context);
} else {
1.2 +4 -4
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/tree/TreeRenderer.java
Index: TreeRenderer.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/tree/TreeRenderer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TreeRenderer.java 3 May 2004 14:20:23 -0000 1.1
+++ TreeRenderer.java 3 May 2004 15:50:40 -0000 1.2
@@ -4,6 +4,7 @@
import org.apache.slide.projector.Context;
import org.apache.slide.projector.Resource;
import org.apache.slide.projector.Result;
+import org.apache.slide.projector.URI;
import org.apache.slide.projector.processor.TemplateRenderer;
import org.apache.slide.projector.processor.SimpleProcessor;
import org.apache.slide.projector.descriptor.MapValueDescriptor;
@@ -48,7 +49,6 @@
}
}
parameterDescriptors = new ParameterDescriptor[] {
- new ParameterDescriptor(ACTIVE_ID, new
ParameterMessage("treeRenderer/activeId"), new StringValueDescriptor(), new
NullResource()),
new ParameterDescriptor(ID, new ParameterMessage("treeRenderer/id"),
new TreeValueDescriptor(new StringValueDescriptor())),
new ParameterDescriptor(SimpleProcessor.INPUT, new
ParameterMessage("treeRenderer/input"), new TreeValueDescriptor(new
MapValueDescriptor(validMapEntries)))
};
@@ -57,11 +57,11 @@
public Result process(Map parameter, Context context) throws Exception {
Resource[] idArray = ((ArrayResource)parameter.get(ID)).getArray();
Resource[] inputArray =
((ArrayResource)parameter.get(SimpleProcessor.INPUT)).getArray();
- Resource activeIdResource = (Resource)parameter.get(ACTIVE_ID);
+ URI activeIdResource = (URI)context.getBookmark();
String activeId = null;
int[] active = new int[0];
- if ( activeIdResource instanceof StringResource ) {
- activeId = ((StringResource)activeIdResource).toString();
+ if ( activeIdResource != null ) {
+ activeId = activeIdResource.toString();
String path = buildPathToActiveNode(null, activeId, idArray);
if ( path != null ) {
StringTokenizer tokenizer = new StringTokenizer(path, ",");
1.2 +2 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FormHandler.java 3 May 2004 14:20:18 -0000 1.1
+++ FormHandler.java 3 May 2004 15:50:40 -0000 1.2
@@ -32,7 +32,7 @@
URI processorURI = (URI)parameter.get(Trigger.PROCESSOR);
Processor processor =
ProcessorManager.getInstance().getProcessor(processorURI);
ProcessorHelper.validate(processor.getParameterDescriptors(), parameter,
context);
- context.getStore(Store.SESSION).put(Constants.CURRENT_PROCESSOR_URI, new
StringResource(processorURI.toString()));
+ context.setBookmark(processorURI);
return processor.process(parameter, context);
}
1.2 +3 -1
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/TestServlet.java
Index: TestServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/TestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestServlet.java 3 May 2004 14:20:20 -0000 1.1
+++ TestServlet.java 3 May 2004 15:50:40 -0000 1.2
@@ -47,7 +47,9 @@
processor = ProcessorManager.getInstance().getProcessor(uri);
Scheduler.getInstance();
Scheduler.setContext(context);
-
context.getStore(Store.SESSION).put(Constants.CURRENT_PROCESSOR_URI, new
StringResource(uri.toString()));
+ if (
ProcessorManager.getInstance().getProcessorDescriptor(uri).isBookmark() ) {
+ context.setBookmark(uri);
+ }
validatedParameters.put(Control.ACTION, uri);
validatedParameters.put("handler", new
URIResource(request.getRequestURI()));
validatedParameters.put("submit", new StringResource("Los..."));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
