unico 2004/07/02 07:10:02
Modified: src/share/org/apache/slide/search/basic
BasicExpressionCompiler.java
Log:
expression factory initialization already occurs in constructor
Revision Changes Path
1.8 +10 -14
jakarta-slide/src/share/org/apache/slide/search/basic/BasicExpressionCompiler.java
Index: BasicExpressionCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicExpressionCompiler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BasicExpressionCompiler.java 11 Feb 2004 14:20:05 -0000 1.7
+++ BasicExpressionCompiler.java 2 Jul 2004 14:10:02 -0000 1.8
@@ -223,22 +223,18 @@
private IBasicExpression createExpression (Element expressionElement)
throws BadQueryException
{
- IBasicExpressionFactory factory = null;
+ IBasicExpression expression = null;
if (isContentExpression (expressionElement)) {
- factory = query.getContentExpressionFactory();
+ expression =
contentExpressionFactory.createExpression(expressionElement);
}
else {
- factory = query.getPropertiesExpressionFactory();
+ expression =
propertiesExpressionFactory.createExpression(expressionElement);
}
-
- if (factory == null)
- factory = genericExpressionFactory;
-
-
- IBasicExpression expression = factory.createExpression (expressionElement);
- if (expression == null)
+
+ if (expression == null) {
expression = genericExpressionFactory.createExpression
(expressionElement);
+ }
return expression;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
