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:40:29 UTC
svn commit: r454130 - in
/cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow:
javascript/JavaScriptFlowHelper.java
javascript/fom/FOM_JavaScriptFlowHelper.java util/PipelineUtil.java
Author: joerg
Date: Sun Oct 8 04:40:28 2006
New Revision: 454130
URL: http://svn.apache.org/viewvc?view=rev&rev=454130
Log:
introduce a JavaScriptFlowHelper extending FlowHelper in core for the JS-specific unwrap() method,
FOM_JavaScriptFlowHelper now extends JavaScriptFlowHelper (might be merged?)
Added:
cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/JavaScriptFlowHelper.java
Modified:
cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptFlowHelper.java
cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/util/PipelineUtil.java
Added: cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/JavaScriptFlowHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/JavaScriptFlowHelper.java?view=auto&rev=454130
==============================================================================
--- cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/JavaScriptFlowHelper.java (added)
+++ cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/JavaScriptFlowHelper.java Sun Oct 8 04:40:28 2006
@@ -0,0 +1,22 @@
+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
+ */
+ 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/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptFlowHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptFlowHelper.java?view=diff&rev=454130&r1=454129&r2=454130
==============================================================================
--- cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptFlowHelper.java (original)
+++ cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptFlowHelper.java Sun Oct 8 04:40:28 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 $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/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=454130&r1=454129&r2=454130
==============================================================================
--- 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 Sun Oct 8 04:40:28 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;
@@ -103,7 +102,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, PipelineUtil.unwrap(viewData));
+ FlowHelper.setContextObject(objectModel, JavaScriptFlowHelper.unwrap(viewData));
Source src = null;
InputStream input = null;
@@ -140,7 +139,7 @@
Map objectModel = ContextHelper.getObjectModel(this.context);
Object oldViewData = FlowHelper.getContextObject(objectModel);
- FlowHelper.setContextObject(objectModel, PipelineUtil.unwrap(viewData));
+ FlowHelper.setContextObject(objectModel, JavaScriptFlowHelper.unwrap(viewData));
Source src = null;
try {
@@ -166,7 +165,7 @@
Map objectModel = ContextHelper.getObjectModel(this.context);
Object oldViewData = FlowHelper.getContextObject(objectModel);
- FlowHelper.setContextObject(objectModel, PipelineUtil.unwrap(viewData));
+ FlowHelper.setContextObject(objectModel, JavaScriptFlowHelper.unwrap(viewData));
Source src = null;
@@ -179,17 +178,5 @@
this.resolver.release(src);
}
}
- }
-
- /**
- * Unwrap a Rhino object (getting the raw java object) and convert undefined to null
- */
- public static Object unwrap(Object obj) {
- if (obj instanceof Wrapper) {
- obj = ((Wrapper)obj).unwrap();
- } else if (obj == Undefined.instance) {
- obj = null;
- }
- return obj;
}
}
Re: svn commit: r454130 - in /cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow:
javascript/JavaScriptFlowHelper.java javascript/fom/FOM_JavaScriptFlowHelper.java
util/PipelineUtil.java
Posted by Joerg Heinicke <jo...@gmx.de>.
On 08.10.2006 14:02, Jorg Heymans wrote:
>
> http://www.apache.org/dev/svn-eol-style.txt
>
> However this won't work for files you already added. For those you just do
> something like "svn propset svn:eol-style native yourfile.java" and commit.
>
> It's all described in detail here
> http://svnbook.red-bean.com/en/1.1/ch07s02.html
Thanks, Jorg. Seems to work :)
Jörg
Re: svn commit: r454130 - in /cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow: javascript/JavaScriptFlowHelper.java javascript/fom/FOM_JavaScriptFlowHelper.java util/PipelineUtil.java
Posted by Jorg Heymans <jh...@domek.be>.
http://www.apache.org/dev/svn-eol-style.txt
However this won't work for files you already added. For those you
just do
something like "svn propset svn:eol-style native yourfile.java" and
commit.
It's all described in detail here http://svnbook.red-bean.com/en/1.1/
ch07s02.html
Jorg
On 08 Oct 2006, at 13:47, Joerg Heinicke wrote:
> There seems to be something wrong with my line endings. Where do I
> set them?
>
> Jörg
>
>> +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
>> + */
>> + public static Object unwrap(Object obj) {
>> + if (obj instanceof Wrapper) {
>> + obj = ((Wrapper)obj).unwrap();
>> + } else if (obj == Undefined.instance) {
>> + obj = null;
>> + }
>> + return obj;
>> + }
>> +
>> +}
Re: svn commit: r454130 - in /cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow:
javascript/JavaScriptFlowHelper.java javascript/fom/FOM_JavaScriptFlowHelper.java
util/PipelineUtil.java
Posted by Joerg Heinicke <jo...@gmx.de>.
There seems to be something wrong with my line endings. Where do I set them?
Jörg
> +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
>
> + */
>
> + public static Object unwrap(Object obj) {
>
> + if (obj instanceof Wrapper) {
>
> + obj = ((Wrapper)obj).unwrap();
>
> + } else if (obj == Undefined.instance) {
>
> + obj = null;
>
> + }
>
> + return obj;
>
> + }
>
> +
>
> +}