cziegeler 2003/07/04 10:55:17
Modified: src/blocks/woody/java/org/apache/cocoon/woody
FormManager.java
src/blocks/woody/java/org/apache/cocoon/woody/formmodel
Form.java
src/blocks/woody/java/org/apache/cocoon/woody/expression
DefaultExpressionManager.java
ExpressionManager.java
Log:
Make classes subclassable
Revision Changes Path
1.6 +3 -3
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/FormManager.java
Index: FormManager.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/FormManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FormManager.java 4 Jul 2003 12:50:11 -0000 1.5
+++ FormManager.java 4 Jul 2003 17:55:16 -0000 1.6
@@ -60,9 +60,9 @@
*/
public interface FormManager {
- public static final String ROLE = FormManager.class.getName();
+ String ROLE = FormManager.class.getName();
- public Form createForm(Source source) throws Exception;
+ Form createForm(Source source) throws Exception;
- public WidgetDefinition buildWidgetDefinition(Element widgetDefinition)
throws Exception;
+ WidgetDefinition buildWidgetDefinition(Element widgetDefinition) throws
Exception;
}
1.6 +1 -0
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/Form.java
Index: Form.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/Form.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Form.java 3 Jul 2003 09:03:19 -0000 1.5
+++ Form.java 4 Jul 2003 17:55:16 -0000 1.6
@@ -64,6 +64,7 @@
* a form description file.
*/
public class Form extends AbstractWidget {
+
private List widgets;
private Map widgetsById;
private FormDefinition definition;
1.2 +7 -3
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/expression/DefaultExpressionManager.java
Index: DefaultExpressionManager.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/expression/DefaultExpressionManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultExpressionManager.java 22 Apr 2003 12:04:19 -0000 1.1
+++ DefaultExpressionManager.java 4 Jul 2003 17:55:16 -0000 1.2
@@ -54,6 +54,7 @@
import org.outerj.expression.ExpressionException;
import org.outerj.expression.ParseException;
import org.outerj.expression.FormulaParser;
+import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.thread.ThreadSafe;
/**
@@ -62,9 +63,12 @@
* <p>In the future, this component should become configurable so that new,
user-defined
* functions can be registered.
*/
-public class DefaultExpressionManager implements ExpressionManager,
ThreadSafe {
- public Expression parse(String expressionString) throws ParseException,
ExpressionException
- {
+public class DefaultExpressionManager
+ implements ExpressionManager, Component, ThreadSafe {
+
+ public Expression parse(String expressionString)
+ throws ParseException, ExpressionException {
+
FormulaParser parser = new FormulaParser(new
java.io.StringReader(expressionString)); //, functionFactory);
parser.sum();
1.2 +4 -3
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/expression/ExpressionManager.java
Index: ExpressionManager.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/expression/ExpressionManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExpressionManager.java 22 Apr 2003 12:04:19 -0000 1.1
+++ ExpressionManager.java 4 Jul 2003 17:55:16 -0000 1.2
@@ -60,7 +60,8 @@
* new functions can be registered in one place.
*/
public interface ExpressionManager {
- public static final String ROLE =
"org.apache.cocoon.woody.expression.ExpressionManager";
-
- public Expression parse(String expression) throws ParseException,
ExpressionException;
+
+ String ROLE = ExpressionManager.class.getName();
+
+ Expression parse(String expression) throws ParseException,
ExpressionException;
}
