You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by wa...@apache.org on 2002/08/20 13:56:48 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/search/basic BasicExpressionCompiler.java IBasicExpressionCompilerProvider.java IBasicQuery.java
wam 2002/08/20 04:56:48
Modified: src/share/org/apache/slide/search/basic
BasicExpressionCompiler.java
IBasicExpressionCompilerProvider.java
IBasicQuery.java
Log:
ease creating the expressionFactory
Revision Changes Path
1.2 +10 -4 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasicExpressionCompiler.java 19 Jun 2002 11:00:11 -0000 1.1
+++ BasicExpressionCompiler.java 20 Aug 2002 11:56:48 -0000 1.2
@@ -128,7 +128,7 @@
* @param propertyProvider the PropertyProvider to use (may be
* <code>null</code>).
*/
- public BasicExpressionCompiler(IBasicQuery query, PropertyProvider propertyProvider) {
+ public BasicExpressionCompiler (IBasicQuery query, PropertyProvider propertyProvider) throws BadQueryException {
this(query, propertyProvider, null);
}
@@ -141,10 +141,16 @@
* <code>null</code>).
* @param defaultExpressionFactory the default IBasicExpressionFactory to use.
*/
- public BasicExpressionCompiler(IBasicQuery query, PropertyProvider propertyProvider, IBasicExpressionFactory defaultExpressionFactory) {
+ public BasicExpressionCompiler (IBasicQuery query,
+ PropertyProvider propertyProvider,
+ IBasicExpressionFactory defaultExpressionFactory)
+ throws BadQueryException
+ {
this.query = query;
this.propertyProvider = propertyProvider;
this.defaultExpressionFactory = defaultExpressionFactory;
+ storeSpecificExpressionFactory = query.getExpressionFactory();
+ storeSpecificExpressionFactory.init (query, propertyProvider);
}
/**
1.2 +6 -3 jakarta-slide/src/share/org/apache/slide/search/basic/IBasicExpressionCompilerProvider.java
Index: IBasicExpressionCompilerProvider.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/IBasicExpressionCompilerProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IBasicExpressionCompilerProvider.java 19 Jun 2002 11:00:11 -0000 1.1
+++ IBasicExpressionCompilerProvider.java 20 Aug 2002 11:56:48 -0000 1.2
@@ -64,6 +64,7 @@
// import list
import org.apache.slide.search.PropertyProvider;
+import org.apache.slide.search.BadQueryException;
/**
* Provides an IBasicExpressionCompiler for the given IBasicQuery
@@ -84,7 +85,9 @@
*
* @return an IBasicExpressionCompiler for the given parameters.
*/
- public IBasicExpressionCompiler getCompiler(IBasicQuery query, PropertyProvider propertyProvider);
+ public IBasicExpressionCompiler
+ getCompiler(IBasicQuery query, PropertyProvider propertyProvider)
+ throws BadQueryException;
}
1.3 +19 -5 jakarta-slide/src/share/org/apache/slide/search/basic/IBasicQuery.java
Index: IBasicQuery.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/IBasicQuery.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IBasicQuery.java 21 Jun 2002 13:26:16 -0000 1.2
+++ IBasicQuery.java 20 Aug 2002 11:56:48 -0000 1.3
@@ -182,8 +182,22 @@
* @return a PropertyProvider
*
*/
- public PropertyProvider getPropertyProvider ();
+ PropertyProvider getPropertyProvider ();
+ /**
+ * Method getExpressionFactory
+ *
+ * @return an IBasicExpressionFactory
+ *
+ */
+ IBasicExpressionFactory getExpressionFactory ();
+ /**
+ * Method init
+ *
+ * @param token a SearchToken
+ *
+ */
+ void init (SearchToken token);
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>