You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2006/08/17 18:03:03 UTC
svn commit: r432266 - in
/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query:
NodeIteratorImpl.java QueryImpl.java QueryManagerImpl.java
QueryResultImpl.java RowIteratorImpl.java ScoreNodeIterator.java
Author: angela
Date: Thu Aug 17 09:03:02 2006
New Revision: 432266
URL: http://svn.apache.org/viewvc?rev=432266&view=rev
Log:
work in progress
- javadoc
- remove some DIFF comments
Modified:
jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/NodeIteratorImpl.java
jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryImpl.java
jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryManagerImpl.java
jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryResultImpl.java
jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/RowIteratorImpl.java
jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/ScoreNodeIterator.java
Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/NodeIteratorImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/NodeIteratorImpl.java?rev=432266&r1=432265&r2=432266&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/NodeIteratorImpl.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/NodeIteratorImpl.java Thu Aug 17 09:03:02 2006
@@ -33,7 +33,6 @@
import java.util.NoSuchElementException;
import java.util.Iterator;
-// DIFF JR: this class uses a different package than the jackrabbit original
/**
* Implements a {@link javax.jcr.NodeIterator} returned by
* {@link javax.jcr.query.QueryResult#getNodes()}.
@@ -79,7 +78,6 @@
* @param queryInfo the query result.
* @throws RepositoryException if an error occurs while creating a node iterator.
*/
- // DIFF JR: use QueryInfo instead of UUID String[]
public NodeIteratorImpl(ItemManager itemMgr, ItemStateManager itemStateMgr,
QueryInfo queryInfo) throws RepositoryException {
this.itemMgr = itemMgr;
Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryImpl.java?rev=432266&r1=432265&r2=432266&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryImpl.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryImpl.java Thu Aug 17 09:03:02 2006
@@ -55,7 +55,6 @@
/**
* The namespace nsResolver of the session that executes this query.
*/
- // DIFF JR: added
private final NamespaceResolver nsResolver;
/**
@@ -85,10 +84,8 @@
private Node node;
/**
- * The query handler for this query.
+ * The WorkspaceManager used to execute queries.
*/
- // DIFF JR: use WorkspaceManager (-> RepositoryService) instead
- //protected QueryHandler handler;
private WorkspaceManager wspManager;
/**
@@ -103,7 +100,6 @@
* @param language the language of the query statement.
* @throws InvalidQueryException if the query is invalid.
*/
- // DIFF JR: uses WorkspaceManager instead of QueryHandler
public QueryImpl(Session session, NamespaceResolver nsResolver,
ItemManager itemMgr, ItemStateManager itemStateManager,
WorkspaceManager wspManager,
@@ -115,7 +111,7 @@
this.statement = statement;
this.language = language;
this.wspManager = wspManager;
- // DIFF JR: todo validate statement
+ // TODO: validate statement
//this.query = handler.createExecutableQuery(session, itemMgr, statement, language);
}
@@ -131,7 +127,6 @@
* @throws RepositoryException if another error occurs while reading from
* the node.
*/
- // DIFF JR: uses WorkspaceManager instead of QueryHandler
public QueryImpl(Session session, NamespaceResolver nsResolver,
ItemManager itemMgr, ItemStateManager itemStateManager,
WorkspaceManager wspManager, Node node)
@@ -150,7 +145,7 @@
}
statement = node.getProperty(NameFormat.format(QName.JCR_STATEMENT, nsResolver)).getString();
language = node.getProperty(NameFormat.format(QName.JCR_LANGUAGE, nsResolver)).getString();
- // DIFF JR: todo validate statement
+ // TODO: validate statement
//query = handler.createExecutableQuery(session, itemMgr, statement, language);
} catch (NoPrefixDeclaredException e) {
throw new RepositoryException(e.getMessage(), e);
Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryManagerImpl.java?rev=432266&r1=432265&r2=432266&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryManagerImpl.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryManagerImpl.java Thu Aug 17 09:03:02 2006
@@ -41,7 +41,6 @@
/**
* The namespace nsResolver for this query manager.
*/
- // DIFF JR: added
private final NamespaceResolver nsResolver;
/**
Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryResultImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryResultImpl.java?rev=432266&r1=432265&r2=432266&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryResultImpl.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryResultImpl.java Thu Aug 17 09:03:02 2006
@@ -15,7 +15,6 @@
* limitations under the License.
*/
package org.apache.jackrabbit.jcr2spi.query;
-// DIFF JR: this class uses a different package than the jackrabbit original
import org.apache.jackrabbit.jcr2spi.ItemManager;
import org.apache.jackrabbit.jcr2spi.state.ItemStateManager;
@@ -83,7 +82,6 @@
*/
public String[] getColumnNames() throws RepositoryException {
try {
- // DIFF JR: obtain names from QueryInfo
QName[] names = queryInfo.getColumnNames();
String[] propNames = new String[names.length];
for (int i = 0; i < names.length; i++) {
Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/RowIteratorImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/RowIteratorImpl.java?rev=432266&r1=432265&r2=432266&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/RowIteratorImpl.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/RowIteratorImpl.java Thu Aug 17 09:03:02 2006
@@ -174,7 +174,6 @@
/**
* The underlying <code>Node</code> of this result row.
*/
- // DIFF JR: use Node instead of NodeImpl
private final Node node;
/**
@@ -193,7 +192,6 @@
* @param score the score value for this result row
* @param node the underlying <code>Node</code> for this <code>Row</code>.
*/
- // DIFF JR: use Node instead of NodeImpl
private RowImpl(float score, Node node) {
this.score = score;
this.node = node;
Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/ScoreNodeIterator.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/ScoreNodeIterator.java?rev=432266&r1=432265&r2=432266&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/ScoreNodeIterator.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/ScoreNodeIterator.java Thu Aug 17 09:03:02 2006
@@ -15,7 +15,6 @@
* limitations under the License.
*/
package org.apache.jackrabbit.jcr2spi.query;
-// DIFF JR: this class uses a different package than the jackrabbit original
import javax.jcr.NodeIterator;