wam 2003/06/03 00:05:02
Modified: src/share/org/apache/slide/search/basic
BasicExpressionCompiler.java
BasicExpressionFactory.java BasicQueryEnvelope.java
Log:
cosmetic
Revision Changes Path
1.3 +10 -8
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BasicExpressionCompiler.java 20 Aug 2002 11:56:48 -0000 1.2
+++ BasicExpressionCompiler.java 3 Jun 2003 07:05:02 -0000 1.3
@@ -193,16 +193,18 @@
*
* @throws BadQueryException
*/
- public IBasicExpression createMergeExpression (String name, String namespace,
List expressionsToMerge) throws BadQueryException {
+ IBasicExpression createMergeExpression (String name, String namespace, List
expressionsToMerge) throws BadQueryException {
IBasicExpression mergeExpression = null;
if (getStoreSpecificExpressionFactory() != null) {
- mergeExpression =
getStoreSpecificExpressionFactory().createMergeExpression(name,
+ mergeExpression =
+
getStoreSpecificExpressionFactory().createMergeExpression(name,
namespace,
expressionsToMerge);
}
if (mergeExpression == null) {
- mergeExpression =
getDefaultExpressionFactory().createMergeExpression(name,
+ mergeExpression =
+
getDefaultExpressionFactory().createMergeExpression(name,
namespace,
expressionsToMerge);
}
@@ -218,7 +220,7 @@
*
* @throws BadQueryException
*/
- public IBasicExpression createExpression (Element expressionElement) throws
BadQueryException {
+ IBasicExpression createExpression (Element expressionElement) throws
BadQueryException {
IBasicExpression expression = null;
if (getStoreSpecificExpressionFactory() != null) {
1.9 +4 -4
jakarta-slide/src/share/org/apache/slide/search/basic/BasicExpressionFactory.java
Index: BasicExpressionFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicExpressionFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BasicExpressionFactory.java 20 Jun 2002 05:22:25 -0000 1.8
+++ BasicExpressionFactory.java 3 Jun 2003 07:05:02 -0000 1.9
@@ -84,7 +84,7 @@
*/
public class BasicExpressionFactory implements IBasicExpressionFactory {
- public static final String EXPRESSION_FACTORY = "ExpressionFactory";
+ // public static final String EXPRESSION_FACTORY = "ExpressionFactory";
/**
* The pool of resources in the given scope.
1.5 +5 -6
jakarta-slide/src/share/org/apache/slide/search/basic/BasicQueryEnvelope.java
Index: BasicQueryEnvelope.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicQueryEnvelope.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BasicQueryEnvelope.java 9 Oct 2002 14:14:42 -0000 1.4
+++ BasicQueryEnvelope.java 3 Jun 2003 07:05:02 -0000 1.5
@@ -204,7 +204,7 @@
*/
public SearchQueryResult execute() throws ServiceAccessException {
Iterator it = subQueries.keySet().iterator();
- SearchQueryResult result = new SearchQueryResult ();
+ SearchQueryResult result = null;
if (topLevelQuery.orderBy != null) {
result = new SearchQueryResult
(topLevelQuery.orderBy.getComparator());
@@ -320,7 +320,6 @@
*
*/
public AbstractStore getStore() {
- // if (true) throw new RuntimeException ("shit happens");
return topLevelQuery.getStore();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
