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 lu...@apache.org on 2004/11/01 18:51:42 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/search/basic ComparableResourcesPoolImpl.java
luetzkendorf 2004/11/01 09:51:42
Modified: src/share/org/apache/slide/search/basic
ComparableResourcesPoolImpl.java
Log:
remove some unused stuff; pool is now created as late as possible (I
try to use this in an late optimization)
Revision Changes Path
1.5 +17 -16 jakarta-slide/src/share/org/apache/slide/search/basic/ComparableResourcesPoolImpl.java
Index: ComparableResourcesPoolImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/ComparableResourcesPoolImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ComparableResourcesPoolImpl.java 28 Jul 2004 09:35:02 -0000 1.4
+++ ComparableResourcesPoolImpl.java 1 Nov 2004 17:51:42 -0000 1.5
@@ -28,15 +28,14 @@
import java.util.Iterator;
import java.util.Set;
+import org.apache.slide.common.Scope;
import org.apache.slide.common.SlideException;
import org.apache.slide.common.SlideToken;
-import org.apache.slide.content.Content;
import org.apache.slide.search.BadQueryException;
import org.apache.slide.search.InvalidScopeException;
import org.apache.slide.search.PropertyProvider;
import org.apache.slide.search.QueryScope;
import org.apache.slide.search.SearchToken;
-import org.apache.slide.search.SlideUri;
import org.apache.slide.structure.ObjectNode;
import org.apache.slide.structure.Structure;
import org.apache.slide.structure.StructureException;
@@ -51,7 +50,6 @@
/** */
private Structure structure;
- private Content contentHelper;
private SlideToken slideToken;
private QueryScope scope;
private SearchToken searchToken;
@@ -59,8 +57,7 @@
private int scopeDepth;
private int maxSlideDepth;
private boolean partialResult = false;
- private Set pool;
- private SlideUri slideContext;
+ private Set pool = null;
/**
* The PropertyProvider to use (may be <code>null</code>).
@@ -86,14 +83,10 @@
this.slideToken = searchToken.getSlideToken();
this.scope = scope;
this.propertyProvider = propertyProvider;
- this.contentHelper = searchToken.getContentHelper();
- this.slideContext = searchToken.getSlideContext();
this.searchToken = searchToken;
scopeDepth = scope.getDepth ();
maxSlideDepth = searchToken.getMaxDepth();
-
- createPool ();
}
/**
@@ -102,8 +95,8 @@
* @return an Iterator
*
*/
- public Iterator resourceIterator() {
- return pool.iterator();
+ public Iterator resourceIterator() throws BadQueryException {
+ return getPool().iterator();
}
@@ -113,7 +106,10 @@
* @return a Set
*
*/
- public Set getPool() {
+ public Set getPool() throws BadQueryException {
+ if (pool == null) {
+ createPool();
+ }
return pool;
}
@@ -165,6 +161,11 @@
partialResult = true;
return;
}
+
+ if (this.scope.getExcludedScopes().contains(new Scope(object.getUri()))) {
+ return;
+ }
+
Enumeration children = null;
children = structure.getChildren (slideToken, object);
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org