You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gk...@apache.org on 2007/08/02 15:20:52 UTC
svn commit: r562105 - in /cocoon/trunk:
blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/util/
blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/flow/javascript/
blocks/cocoo...
Author: gkossakowski
Date: Thu Aug 2 06:20:51 2007
New Revision: 562105
URL: http://svn.apache.org/viewvc?view=rev&rev=562105
Log:
COCOON-2103: More consistent method signature of setContextObject().
Modified:
cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/util/PipelineUtil.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/flow/javascript/Form.js
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.java
cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java/AbstractContinuable.java
cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/forms/flow/java/FormInstance.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/FlowHelper.java
Modified: cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/util/PipelineUtil.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/util/PipelineUtil.java?view=diff&rev=562105&r1=562104&r2=562105
==============================================================================
--- cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/util/PipelineUtil.java (original)
+++ cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/util/PipelineUtil.java Thu Aug 2 06:20:51 2007
@@ -61,7 +61,7 @@
// Keep the previous view data, if any (is it really necessary?), and set the new one
Object oldViewData = FlowHelper.getContextObject(objectModel);
- FlowHelper.setContextObject(objectModel, JavaScriptFlowHelper.unwrap(viewData), newObjectModel);
+ FlowHelper.setContextObject(objectModel, newObjectModel, JavaScriptFlowHelper.unwrap(viewData));
Source src = null;
InputStream input = null;
@@ -77,7 +77,7 @@
}
// Restore the previous view data
- FlowHelper.setContextObject(objectModel, oldViewData, newObjectModel);
+ FlowHelper.setContextObject(objectModel, newObjectModel, oldViewData);
resolver.release(src);
}
}
@@ -96,14 +96,14 @@
final SourceResolver resolver = getSourceResolver();
Object oldViewData = FlowHelper.getContextObject(objectModel);
- FlowHelper.setContextObject(objectModel, JavaScriptFlowHelper.unwrap(viewData), newObjectModel);
+ FlowHelper.setContextObject(objectModel, newObjectModel, JavaScriptFlowHelper.unwrap(viewData));
Source src = null;
try {
src = resolver.resolveURI("cocoon:/" + uri);
SourceUtil.toSAX(src, handler);
} finally {
- FlowHelper.setContextObject(objectModel, oldViewData, newObjectModel);
+ FlowHelper.setContextObject(objectModel, newObjectModel, oldViewData);
resolver.release(src);
}
}
@@ -120,7 +120,7 @@
final ObjectModel newObjectModel = getNewObjectModel();
final SourceResolver resolver = getSourceResolver();
Object oldViewData = FlowHelper.getContextObject(objectModel);
- FlowHelper.setContextObject(objectModel, JavaScriptFlowHelper.unwrap(viewData), newObjectModel);
+ FlowHelper.setContextObject(objectModel, newObjectModel, JavaScriptFlowHelper.unwrap(viewData));
Source src = null;
@@ -128,7 +128,7 @@
src = resolver.resolveURI("cocoon:/" + uri);
return SourceUtil.toDOM(src);
} finally {
- FlowHelper.setContextObject(objectModel, oldViewData, newObjectModel);
+ FlowHelper.setContextObject(objectModel, newObjectModel, oldViewData);
resolver.release(src);
}
}
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/flow/javascript/Form.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/flow/javascript/Form.js?view=diff&rev=562105&r1=562104&r2=562105
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/flow/javascript/Form.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/flow/javascript/Form.js Thu Aug 2 06:20:51 2007
@@ -131,7 +131,7 @@
// FIXME : hack needed because FOM doesn't provide access to the object model
var objectModel = org.apache.cocoon.components.ContextHelper.getObjectModel(this.avalonContext);
var newObjectModel = cocoon.getComponent(org.apache.cocoon.objectmodel.ObjectModel.ROLE);
- org.apache.cocoon.components.flow.FlowHelper.setContextObject(objectModel, viewdata, newObjectModel);
+ org.apache.cocoon.components.flow.FlowHelper.setContextObject(objectModel, newObjectModel, viewdata);
if (this.restoreHook) {
this.restoreHook(this);
@@ -199,7 +199,7 @@
// FIXME : hack needed because FOM doesn't provide access to the object model
var objectModel = org.apache.cocoon.components.ContextHelper.getObjectModel(this.avalonContext);
var newObjectModel = cocoon.getComponent(org.apache.cocoon.objectmodel.ObjectModel.ROLE);
- org.apache.cocoon.components.flow.FlowHelper.setContextObject(objectModel, viewdata, newObjectModel);
+ org.apache.cocoon.components.flow.FlowHelper.setContextObject(objectModel, newObjectModel, viewdata);
finished = this.form.process(formContext);
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.java?view=diff&rev=562105&r1=562104&r2=562105
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.java Thu Aug 2 06:20:51 2007
@@ -57,7 +57,7 @@
Request request = new MockRequest();
Map objectModel = new HashMap();
ObjectModel newObjectModel = new ObjectModelImpl();
- FlowHelper.setContextObject(objectModel, flowContextObject, newObjectModel);
+ FlowHelper.setContextObject(objectModel, newObjectModel, flowContextObject);
objectModel.put(ObjectModelHelper.REQUEST_OBJECT, request);
Map contextObjectModel = new HashMap();
contextObjectModel.put(ContextHelper.CONTEXT_OBJECT_MODEL, objectModel);
@@ -90,7 +90,7 @@
Request request = new MockRequest();
Map objectModel = new HashMap();
ObjectModel newObjectModel = new ObjectModelImpl();
- FlowHelper.setContextObject(objectModel, flowContextObject, newObjectModel);
+ FlowHelper.setContextObject(objectModel, newObjectModel, flowContextObject);
objectModel.put(ObjectModelHelper.REQUEST_OBJECT, request);
Map contextObjectModel = new HashMap();
contextObjectModel.put(ContextHelper.CONTEXT_OBJECT_MODEL, objectModel);
Modified: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java/AbstractContinuable.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java/AbstractContinuable.java?view=diff&rev=562105&r1=562104&r2=562105
==============================================================================
--- cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java/AbstractContinuable.java (original)
+++ cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java/AbstractContinuable.java Thu Aug 2 06:20:51 2007
@@ -63,7 +63,7 @@
context.getLogger().debug("send page and wait '" + uri + "'");
ObjectModel newObjectModel = (ObjectModel)getComponent(ObjectModel.ROLE);
FlowHelper.setContextObject(ContextHelper.getObjectModel(context.getAvalonContext()),
- bizdata, newObjectModel);
+ newObjectModel, bizdata);
releaseComponent(newObjectModel);
if (SourceUtil.indexOfSchemeColon(uri) == -1) {
uri = "cocoon:/" + uri;
@@ -99,7 +99,7 @@
ObjectModel newObjectModel = (ObjectModel)getComponent(ObjectModel.ROLE);
FlowHelper.setContextObject(
ContextHelper.getObjectModel(context.getAvalonContext()),
- bizdata, newObjectModel
+ newObjectModel, bizdata
);
releaseComponent(newObjectModel);
Modified: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/forms/flow/java/FormInstance.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/forms/flow/java/FormInstance.java?view=diff&rev=562105&r1=562104&r2=562105
==============================================================================
--- cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/forms/flow/java/FormInstance.java (original)
+++ cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/forms/flow/java/FormInstance.java Thu Aug 2 06:20:51 2007
@@ -196,7 +196,7 @@
// (the same is done by cocoon.sendPage())
//FIXME: I'm not sure if ObjectModel shouldn't be part of CocoonContinuationContext
ObjectModel newObjectModel = (ObjectModel)getComponent(ObjectModel.ROLE);
- FlowHelper.setContextObject(this.getObjectModel(), bizData, newObjectModel);
+ FlowHelper.setContextObject(this.getObjectModel(), newObjectModel, bizData);
releaseComponent(newObjectModel);
finished = this.form.process(formContext);
} while (!finished);
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java?view=diff&rev=562105&r1=562104&r2=562105
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java Thu Aug 2 06:20:51 2007
@@ -56,7 +56,7 @@
// Make the FOM objects available to the view layer
ObjectModel newObjectModel = (ObjectModel)getBeanFactory().getBean(ObjectModel.ROLE);
- FlowHelper.setContextObject(getObjectModel(), flowContext, newObjectModel);
+ FlowHelper.setContextObject(getObjectModel(), newObjectModel, flowContext);
}
public Map getFlowContext() {
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/AbstractInterpreter.java?view=diff&rev=562105&r1=562104&r2=562105
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/AbstractInterpreter.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/AbstractInterpreter.java Thu Aug 2 06:20:51 2007
@@ -192,7 +192,7 @@
uri = "cocoon:/" + uri;
final Map objectModel = this.processInfoProvider.getObjectModel();
FlowHelper.setWebContinuation(objectModel, newObjectModel, continuation);
- FlowHelper.setContextObject(objectModel, bizData, newObjectModel);
+ FlowHelper.setContextObject(objectModel, newObjectModel, bizData);
if (redirector.hasRedirected()) {
throw new IllegalStateException("Pipeline has already been processed for this request");
}
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/FlowHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/FlowHelper.java?view=diff&rev=562105&r1=562104&r2=562105
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/FlowHelper.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/FlowHelper.java Thu Aug 2 06:20:51 2007
@@ -82,10 +82,10 @@
* Set the flow context object associated with the current request
*
* @param objectModel The Cocoon Environment's object model
- * @param obj The context object
* @param newObjectModel TODO
+ * @param obj The context object
*/
- public final static void setContextObject(Map objectModel, Object obj, ObjectModel newObjectModel) {
+ public final static void setContextObject(Map objectModel, ObjectModel newObjectModel, Object obj) {
objectModel.put(CONTEXT_OBJECT, obj);
}
}