juergen 2002/06/05 21:53:25
Modified: src/share/org/apache/slide/search/basic
BasicQueryFactory.java BasicSearchLanguage.java
NotNormalizer.java
src/share/org/apache/slide/search Search.java
SearchImpl.java SearchLanguage.java
Log:
Removed support for org.w3c.dom.
(ralf)
Revision Changes Path
1.2 +2 -23
jakarta-slide/src/share/org/apache/slide/search/basic/BasicQueryFactory.java
Index: BasicQueryFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicQueryFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasicQueryFactory.java 31 May 2002 12:23:23 -0000 1.1
+++ BasicQueryFactory.java 6 Jun 2002 04:53:25 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicQueryFactory.java,v
1.1 2002/05/31 12:23:23 wam Exp $
- * $Revision: 1.1 $
- * $Date: 2002/05/31 12:23:23 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicQueryFactory.java,v
1.2 2002/06/06 04:53:25 juergen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/06/06 04:53:25 $
*
* ====================================================================
*
@@ -92,7 +92,7 @@
* BasicQuery.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Wallmer</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class BasicQueryFactory {
@@ -120,27 +120,6 @@
return createQuery (basicSearchElementJDOM, token);
}
-
- // sollte wegschmeissable sein
- /**
- * Method newInstance
- *
- * @param basicSearchElementDOMan Element
- * @param token a SearchToken
- *
- * @return a BasicQuery
- *
- * @throws BadQueryException
- *
- */
- public static BasicQuery newInstance
- (org.w3c.dom.Element basicSearchElementDOM, SearchToken token)
- throws BadQueryException
- {
- org.jdom.Element basicSearchElementJDom =
- new DOMBuilder ().build (basicSearchElementDOM);
- return createQuery (basicSearchElementJDom, token);
- }
/**
1.8 +6 -24
jakarta-slide/src/share/org/apache/slide/search/basic/BasicSearchLanguage.java
Index: BasicSearchLanguage.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicSearchLanguage.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BasicSearchLanguage.java 31 May 2002 12:23:24 -0000 1.7
+++ BasicSearchLanguage.java 6 Jun 2002 04:53:25 -0000 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicSearchLanguage.java,v
1.7 2002/05/31 12:23:24 wam Exp $
- * $Revision: 1.7 $
- * $Date: 2002/05/31 12:23:24 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/BasicSearchLanguage.java,v
1.8 2002/06/06 04:53:25 juergen Exp $
+ * $Revision: 1.8 $
+ * $Date: 2002/06/06 04:53:25 $
*
* ====================================================================
*
@@ -67,14 +67,14 @@
import org.apache.slide.search.SearchQuery;
import org.apache.slide.search.SearchToken;
import org.apache.slide.search.BadQueryException;
-import org.w3c.dom.Element;
+import org.jdom.Element;
import org.apache.slide.content.NodeProperty.NamespaceCache;
/**
* Represent the BasicSearchLanguage for Slide
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Wallmer</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class BasicSearchLanguage extends SearchLanguage {
@@ -123,24 +123,6 @@
/**
* Creates a SearchQuery out of this queryElement
*
- * @param basicSearchElement DOM Element describing this query
- * @param token SearchToken
- *
- * @return BasicSearchQuery
- *
- * @throws BadQueryException
- *
- */
- public SearchQuery parseQuery (Element basicSearchElement, SearchToken token)
- throws BadQueryException
- {
- BasicQuery query = BasicQueryFactory.newInstance (basicSearchElement,
token);
- return query;
- }
-
- /**
- * Creates a SearchQuery out of this queryElement
- *
* @param basicSearchElement JDOM Element describing this query
* @param token SearchToken
*
@@ -149,7 +131,7 @@
* @throws BadQueryException
*
*/
- public SearchQuery parseQuery (org.jdom.Element basicSearchElement, SearchToken
token)
+ public SearchQuery parseQuery (Element basicSearchElement, SearchToken token)
throws BadQueryException
{
BasicQuery query = BasicQueryFactory.newInstance (basicSearchElement,
token);
1.2 +4 -28
jakarta-slide/src/share/org/apache/slide/search/basic/NotNormalizer.java
Index: NotNormalizer.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/NotNormalizer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NotNormalizer.java 5 Jun 2002 13:37:35 -0000 1.1
+++ NotNormalizer.java 6 Jun 2002 04:53:25 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/NotNormalizer.java,v
1.1 2002/06/05 13:37:35 juergen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/06/05 13:37:35 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/NotNormalizer.java,v
1.2 2002/06/06 04:53:25 juergen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/06/06 04:53:25 $
*
* ====================================================================
*
@@ -122,7 +122,7 @@
* </D:and>
* </pre>
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ralf Stuckert</a>
**/
@@ -152,30 +152,6 @@
*/
public Element getQueryWithoutNotExpression(Element expressionElement) throws
BadQueryException {
return getProcessedElement(expressionElement, false);
- }
-
- /**
- * Returns the transformed query where all <code><not></code> elements
- * has been removed.
- *
- * @param expressionElement the (root) Element of the query to transform.
- *
- * @return the transformed query where all <code><not></code> elements
- * has been removed.
- *
- * @throws BadQueryException if transformin the query failed
- * (see {@link
#BAD_NOT_EXPRESSION_EXCEPTION_MESSAGE
- * BAD_NOT_EXPRESSION_EXCEPTION_MESSAGE}).
- */
- public org.w3c.dom.Element getQueryWithoutNotExpression(org.w3c.dom.Element
expressionElement) throws BadQueryException {
-
- Element jdomExpressionElement= new DOMBuilder().build(expressionElement);
- try {
- return new
DOMOutputter().output(getQueryWithoutNotExpression(jdomExpressionElement));
- }
- catch (JDOMException e) {
- throw new BadQueryException(e.getMessage());
- }
}
/**
1.11 +5 -18 jakarta-slide/src/share/org/apache/slide/search/Search.java
Index: Search.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/Search.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Search.java 26 Apr 2002 15:19:12 -0000 1.10
+++ Search.java 6 Jun 2002 04:53:25 -0000 1.11
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/Search.java,v
1.10 2002/04/26 15:19:12 wam Exp $
- * $Revision: 1.10 $
- * $Date: 2002/04/26 15:19:12 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/Search.java,v
1.11 2002/06/06 04:53:25 juergen Exp $
+ * $Revision: 1.11 $
+ * $Date: 2002/06/06 04:53:25 $
*
* ====================================================================
*
@@ -68,13 +68,13 @@
import org.apache.slide.structure.*;
import org.apache.slide.authenticate.CredentialsToken;
import org.apache.slide.util.Configuration;
-import org.w3c.dom.Element;
+import org.jdom.Element;
/**
* Search helper.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public interface Search {
@@ -125,19 +125,6 @@
SearchQuery createSearchQuery (String grammarUri,
Element searchRequestElement,
- SlideToken token,
- int maxDepth,
- String requestUri)
- throws BadQueryException;
-
- SearchQuery createSearchQuery (String grammarUri,
- org.jdom.Element searchRequestElement,
- SlideToken token,
- int maxDepth)
- throws BadQueryException;
-
- SearchQuery createSearchQuery (String grammarUri,
- org.jdom.Element searchRequestElement,
SlideToken token,
int maxDepth,
String requestUri)
1.12 +6 -62 jakarta-slide/src/share/org/apache/slide/search/SearchImpl.java
Index: SearchImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/SearchImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SearchImpl.java 26 Apr 2002 15:19:12 -0000 1.11
+++ SearchImpl.java 6 Jun 2002 04:53:25 -0000 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/SearchImpl.java,v 1.11
2002/04/26 15:19:12 wam Exp $
- * $Revision: 1.11 $
- * $Date: 2002/04/26 15:19:12 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/SearchImpl.java,v 1.12
2002/06/06 04:53:25 juergen Exp $
+ * $Revision: 1.12 $
+ * $Date: 2002/06/06 04:53:25 $
*
* ====================================================================
*
@@ -80,14 +80,14 @@
import org.apache.slide.util.logger.Logger;
import org.apache.slide.search.basic.BasicSearchLanguage;
-import org.w3c.dom.Element;
+import org.jdom.Element;
/**
* Search helper.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
public final class SearchImpl implements Search {
@@ -205,7 +205,7 @@
* Creates a SearchQuery.
*
* @param grammarUri identifier for the SearchLanguage
- * @param queryElement the DOM element containing the query
+ * @param queryElement the JDOM element containing the query
* @param token the SlideToken
* @param maxDepth may be 0, 1 or INFINIT
*
@@ -237,63 +237,7 @@
*
*/
public SearchQuery createSearchQuery (String grammarUri,
- org.jdom.Element queryElement,
- SlideToken token,
- int maxDepth)
- throws BadQueryException
- {
- return createSearchQuery (grammarUri, queryElement, token, maxDepth, null);
- }
-
- /**
- * Creates a SearchQuery.
- *
- * @param grammarUri identifier for the SearchLanguage
- * @param queryElement the DOM element containing the query
- * @param token the SlideToken
- * @param maxDepth may be 0, 1 or INFINIT
- *
- * @return the SearchQuery
- *
- * @throws BadQueryException
- *
- */
- public SearchQuery createSearchQuery (String grammarUri,
Element queryElement,
- SlideToken token,
- int maxDepth,
- String requestUri)
- throws BadQueryException
- {
- SearchQuery result = null;
- // create search token
- SearchToken searchToken =
- SearchToken.createSearchToken (token, contentHelper,
- structureHelper, maxDepth,
- requestUri, namespace);
-
- SearchLanguage language = getLanguage (grammarUri);
- result = language.parseQuery (queryElement, searchToken);
-
-
- return result;
- }
-
- /**
- * Creates a SearchQuery.
- *
- * @param grammarUri identifier for the SearchLanguage
- * @param queryElement the JDOM element containing the query
- * @param token the SlideToken
- * @param maxDepth may be 0, 1 or INFINIT
- *
- * @return the SearchQuery
- *
- * @throws BadQueryException
- *
- */
- public SearchQuery createSearchQuery (String grammarUri,
- org.jdom.Element queryElement,
SlideToken token,
int maxDepth,
String requestUri)
1.8 +6 -20
jakarta-slide/src/share/org/apache/slide/search/SearchLanguage.java
Index: SearchLanguage.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/SearchLanguage.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SearchLanguage.java 26 Apr 2002 15:19:12 -0000 1.7
+++ SearchLanguage.java 6 Jun 2002 04:53:25 -0000 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/SearchLanguage.java,v 1.7
2002/04/26 15:19:12 wam Exp $
- * $Revision: 1.7 $
- * $Date: 2002/04/26 15:19:12 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/SearchLanguage.java,v 1.8
2002/06/06 04:53:25 juergen Exp $
+ * $Revision: 1.8 $
+ * $Date: 2002/06/06 04:53:25 $
*
* ====================================================================
*
@@ -63,13 +63,13 @@
package org.apache.slide.search;
-import org.w3c.dom.Element;
+import org.jdom.Element;
/**
* Base class for a search language.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public abstract class SearchLanguage {
@@ -99,20 +99,6 @@
/**
- * Generate a query object from a DOM Element.
- *
- * @param queryElement DOM element containing the query
- * @param token the SearchToken
- *
- * @return a SearchQuery
- *
- * @throws BadQueryException
- *
- */
- public abstract SearchQuery parseQuery(Element queryElement, SearchToken token)
- throws BadQueryException;
-
- /**
* Generate a query object from a JDOM Element.
*
* @param queryElement JDOM element containing the query
@@ -123,7 +109,7 @@
* @throws BadQueryException
*
*/
- public abstract SearchQuery parseQuery(org.jdom.Element queryElement,
SearchToken token)
+ public abstract SearchQuery parseQuery(Element queryElement, SearchToken token)
throws BadQueryException;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
