You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2006/10/08 13:42:15 UTC
svn commit: r454131 - in
/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow:
FlowHelper.java javascript/JavaScriptFlowHelper.java
javascript/fom/FOM_JavaScriptFlowHelper.java util/PipelineUtil.java
Author: joerg
Date: Sun Oct 8 04:42:14 2006
New Revision: 454131
URL: http://svn.apache.org/viewvc?view=rev&rev=454131
Log:
introduce a JavaScriptFlowHelper extending FlowHelper in core for the JS-specific unwrap() method,
FOM_JavaScriptFlowHelper now extends JavaScriptFlowHelper (might be merged?)
Added:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptFlowHelper.java
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/FlowHelper.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptFlowHelper.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/util/PipelineUtil.java
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/FlowHelper.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/FlowHelper.java?view=diff&rev=454131&r1=454130&r2=454131
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/FlowHelper.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/FlowHelper.java Sun Oct 8 04:42:14 2006
@@ -90,7 +90,7 @@
/**
* Unwrap a Rhino object (getting the raw java object) and convert undefined to null
- * @deprecated Use {@link org.apache.cocoon.components.flow.util.PipelineUtil#unwrap(Object)}
+ * @deprecated Use {@link org.apache.cocoon.components.flow.javascript.JavaScriptFlowHelper#unwrap(Object)}
*/
public static Object unwrap(Object obj) {
if (obj instanceof Wrapper) {
Added: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptFlowHelper.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptFlowHelper.java?view=auto&rev=454131
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptFlowHelper.java (added)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptFlowHelper.java Sun Oct 8 04:42:14 2006
@@ -0,0 +1,23 @@
+package org.apache.cocoon.components.flow.javascript;
+
+import org.apache.cocoon.components.flow.FlowHelper;
+
+import org.mozilla.javascript.Undefined;
+import org.mozilla.javascript.Wrapper;
+
+public class JavaScriptFlowHelper extends FlowHelper {
+
+ /**
+ * Unwrap a Rhino object (getting the raw java object) and convert undefined to null
+ * @since 2.1.10
+ */
+ public static Object unwrap(Object obj) {
+ if (obj instanceof Wrapper) {
+ obj = ((Wrapper)obj).unwrap();
+ } else if (obj == Undefined.instance) {
+ obj = null;
+ }
+ return obj;
+ }
+
+}
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptFlowHelper.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptFlowHelper.java?view=diff&rev=454131&r1=454130&r2=454131
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptFlowHelper.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptFlowHelper.java Sun Oct 8 04:42:14 2006
@@ -16,7 +16,7 @@
*/
package org.apache.cocoon.components.flow.javascript.fom;
-import org.apache.cocoon.components.flow.FlowHelper;
+import org.apache.cocoon.components.flow.javascript.JavaScriptFlowHelper;
import org.mozilla.javascript.Scriptable;
@@ -30,7 +30,7 @@
*
* @version CVS $Id$
*/
-public class FOM_JavaScriptFlowHelper extends FlowHelper {
+public class FOM_JavaScriptFlowHelper extends JavaScriptFlowHelper {
// Constants defining keys in the object model used to store the various objects.
// These constants are private so that access to these objects only go through the
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/util/PipelineUtil.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/util/PipelineUtil.java?view=diff&rev=454131&r1=454130&r2=454131
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/util/PipelineUtil.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/util/PipelineUtil.java Sun Oct 8 04:42:14 2006
@@ -31,12 +31,11 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.components.flow.FlowHelper;
+import org.apache.cocoon.components.flow.javascript.JavaScriptFlowHelper;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.commons.io.IOUtils;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
-import org.mozilla.javascript.Undefined;
-import org.mozilla.javascript.Wrapper;
import org.w3c.dom.Document;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -104,7 +103,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, unwrap(viewData));
+ FlowHelper.setContextObject(objectModel, JavaScriptFlowHelper.unwrap(viewData));
Source src = null;
InputStream input = null;
@@ -141,7 +140,7 @@
Map objectModel = ContextHelper.getObjectModel(this.context);
Object oldViewData = FlowHelper.getContextObject(objectModel);
- FlowHelper.setContextObject(objectModel, unwrap(viewData));
+ FlowHelper.setContextObject(objectModel, JavaScriptFlowHelper.unwrap(viewData));
Source src = null;
try {
@@ -167,7 +166,7 @@
Map objectModel = ContextHelper.getObjectModel(this.context);
Object oldViewData = FlowHelper.getContextObject(objectModel);
- FlowHelper.setContextObject(objectModel, unwrap(viewData));
+ FlowHelper.setContextObject(objectModel, JavaScriptFlowHelper.unwrap(viewData));
Source src = null;
@@ -180,18 +179,5 @@
this.resolver.release(src);
}
}
- }
-
- /**
- * Unwrap a Rhino object (getting the raw java object) and convert undefined to null
- * @since 2.1.10
- */
- public static Object unwrap(Object obj) {
- if (obj instanceof Wrapper) {
- obj = ((Wrapper)obj).unwrap();
- } else if (obj == Undefined.instance) {
- obj = null;
- }
- return obj;
}
}