dion 2004/09/07 21:43:53
Modified: jelly/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf
ScriptTag.java BSFTagLibrary.java
Log:
detab
Revision Changes Path
1.5 +13 -13
jakarta-commons/jelly/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java
Index: ScriptTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/ScriptTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ScriptTag.java 25 Feb 2004 01:31:53 -0000 1.4
+++ ScriptTag.java 8 Sep 2004 04:43:53 -0000 1.5
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@
import org.apache.bsf.BSFManager;
import org.apache.bsf.BSFException;
-/**
+/**
* A tag which evaluates its body using the current scripting language
*
* @author <a href="mailto:[EMAIL PROTECTED]">James Strachan</a>
@@ -39,25 +39,25 @@
/** The Log to which logging calls will be made. */
private static final Log log = LogFactory.getLog(ScriptTag.class.getName() +
".evaluating");
-
+
private BSFEngine engine;
private BSFManager manager;
private String elementName;
private String fileName;
private int columnNumber;
private int lineNumber;
-
+
public ScriptTag(BSFEngine engine, BSFManager manager) {
this.engine = engine;
this.manager = manager;
}
// Tag interface
- //-------------------------------------------------------------------------
+ //-------------------------------------------------------------------------
public void doTag(XMLOutput output) throws MissingAttributeException,
JellyTagException {
String text = getBodyText();
- log.debug(text);
+ log.debug(text);
// XXXX: unfortunately we must sychronize evaluations
// so that we can swizzle in the context.
@@ -66,7 +66,7 @@
synchronized (getRegistry()) {
getRegistry().setJellyContext(context);
- try {
+ try {
// XXXX: hack - there must be a better way!!!
for ( Iterator iter = context.getVariableNames(); iter.hasNext(); )
{
String name = (String) iter.next();
@@ -80,9 +80,9 @@
}
}
}
-
+
// Properties
- //-------------------------------------------------------------------------
+ //-------------------------------------------------------------------------
/**
* @return int
*/
@@ -161,5 +161,5 @@
private JellyContextRegistry getRegistry()
{
return (JellyContextRegistry) this.manager.getObjectRegistry();
- }
+ }
}
1.6 +14 -14
jakarta-commons/jelly/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFTagLibrary.java
Index: BSFTagLibrary.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/bsf/src/java/org/apache/commons/jelly/tags/bsf/BSFTagLibrary.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BSFTagLibrary.java 25 Feb 2004 01:31:53 -0000 1.5
+++ BSFTagLibrary.java 8 Sep 2004 04:43:53 -0000 1.6
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,40 +34,40 @@
public class BSFTagLibrary extends CoreTagLibrary {
private BSFExpressionFactory expressionFactory = new BSFExpressionFactory();
-
+
public BSFTagLibrary() {
registerTagFactory(
- "script",
+ "script",
new TagFactory() {
public Tag createTag(String name, Attributes attributes)
throws JellyException {
return createScriptTag(name, attributes);
}
}
- );
+ );
}
public BSFTagLibrary(String language) {
this();
setLanguage(language);
}
-
+
public void setLanguage(String language) {
expressionFactory.setLanguage(language);
}
-
+
/** Allows derived tag libraries to use their own factory */
protected ExpressionFactory getExpressionFactory() {
return expressionFactory;
}
- protected BSFEngine getBSFEngine() throws BSFException {
- return expressionFactory.getBSFEngine();
- }
-
+ protected BSFEngine getBSFEngine() throws BSFException {
+ return expressionFactory.getBSFEngine();
+ }
+
/**
* Factory method to create a new ScriptTag with a BSFEngine
- *
+ *
* @param name is the name of the tag (typically 'script')
* @param attributes the attributes of the tag
* @return Tag
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
