jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r1064670 - in /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query: ./ lucene/ lucene/join/
Date Fri, 28 Jan 2011 13:42:18 GMT
Author: angela
Date: Fri Jan 28 13:42:17 2011
New Revision: 1064670

URL: http://svn.apache.org/viewvc?rev=1064670&view=rev
Log:
javadoc, minor improvement

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PropertyTypeRegistry.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryHandlerContext.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryImpl.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CommittableIndexReader.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/FieldSelectors.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexHistory.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMerger.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamePathResolverImpl.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/PropertiesSynonymProvider.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WeightedHighlighter.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/QueryEngine.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/ScoreNodeMap.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PropertyTypeRegistry.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PropertyTypeRegistry.java?rev=1064670&r1=1064669&r2=1064670&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PropertyTypeRegistry.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PropertyTypeRegistry.java
Fri Jan 28 13:42:17 2011
@@ -120,7 +120,7 @@ public class PropertyTypeRegistry implem
     }
 
     public void nodeTypesUnregistered(Collection<Name> names) {
-        // remove all TypeMapping instances refering to this ntName
+        // remove all TypeMapping instances referring to this ntName
         synchronized (typeMapping) {
             Map<Name, TypeMapping[]> modified = new HashMap<Name, TypeMapping[]>();
             for (Iterator<Name> it = typeMapping.keySet().iterator(); it.hasNext();)
{

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryHandlerContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryHandlerContext.java?rev=1064670&r1=1064669&r2=1064670&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryHandlerContext.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryHandlerContext.java
Fri Jan 28 13:42:17 2011
@@ -188,7 +188,7 @@ public class QueryHandlerContext {
      * Returns the id of the node that should be excluded from indexing. Any
      * descendant of this node is also excluded from indexing.
      *
-     * @return the uuid of the exluded node.
+     * @return the uuid of the excluded node.
      */
     public NodeId getExcludedNodeId() {
         return excludedNodeId;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryImpl.java?rev=1064670&r1=1064669&r2=1064670&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryImpl.java
Fri Jan 28 13:42:17 2011
@@ -231,7 +231,7 @@ public class QueryImpl extends AbstractQ
      */
     public void setLimit(long limit) {
         if (limit < 0) {
-            throw new IllegalArgumentException("limit must not be negativ");
+            throw new IllegalArgumentException("limit must not be negative");
         }
         this.limit = limit;
     }
@@ -243,7 +243,7 @@ public class QueryImpl extends AbstractQ
      */
     public void setOffset(long offset) {
         if (offset < 0) {
-            throw new IllegalArgumentException("offset must not be negativ");
+            throw new IllegalArgumentException("offset must not be negative");
         }
         this.offset = offset;
     }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CommittableIndexReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CommittableIndexReader.java?rev=1064670&r1=1064669&r2=1064670&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CommittableIndexReader.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CommittableIndexReader.java
Fri Jan 28 13:42:17 2011
@@ -29,7 +29,7 @@ import java.io.IOException;
 class CommittableIndexReader extends FilterIndexReader {
 
     /**
-     * A modification count on this index reader. Initialied with
+     * A modification count on this index reader. Initialized with
      * {@link IndexReader#getVersion()} and incremented with every call to
      * {@link #doDelete(int)}.
      */

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/FieldSelectors.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/FieldSelectors.java?rev=1064670&r1=1064669&r2=1064670&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/FieldSelectors.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/FieldSelectors.java
Fri Jan 28 13:42:17 2011
@@ -25,7 +25,7 @@ import org.apache.lucene.document.FieldS
 public class FieldSelectors {
 
     /**
-     * Do not instanciate.
+     * Do not instantiate.
      */
     private FieldSelectors() {
     }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexHistory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexHistory.java?rev=1064670&r1=1064669&r2=1064670&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexHistory.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexHistory.java
Fri Jan 28 13:42:17 2011
@@ -104,7 +104,7 @@ class IndexHistory {
      * <li>{@link Long#MIN_VALUE}: indicates that there is no index segment with the
given name.</li>
      * </ul>
      *
-     * @param indexName name of an index segement.
+     * @param indexName name of an index segment.
      * @return the time when the index segment with the given name was in use
      *          the last time.
      */

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMerger.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMerger.java?rev=1064670&r1=1064669&r2=1064670&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMerger.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMerger.java
Fri Jan 28 13:42:17 2011
@@ -92,8 +92,8 @@ class IndexMerger implements IndexListen
 
     /**
      * Read/write lock for index segment replacement. A shared read lock is
-     * aquired for an index replacement. An exclusive write lock is acquired
-     * when this index merger is shuting down, to prevent further index
+     * acquired for an index replacement. An exclusive write lock is acquired
+     * when this index merger is shutting down, to prevent further index
      * replacements.
      */
     private final ReadWriteLock indexReplacement = new ReentrantReadWriteLock();

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java?rev=1064670&r1=1064669&r2=1064670&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java
Fri Jan 28 13:42:17 2011
@@ -74,7 +74,7 @@ import org.slf4j.LoggerFactory;
  * This class is thread-safe.
  * <p/>
  * Note on implementation: Multiple modifying threads are synchronized on a
- * <code>MultiIndex</code> instance itself. Sychronization between a modifying
+ * <code>MultiIndex</code> instance itself. Synchronization between a modifying
  * thread and reader threads is done using {@link #updateMonitor} and
  * {@link #updateInProgress}.
  */

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamePathResolverImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamePathResolverImpl.java?rev=1064670&r1=1064669&r2=1064670&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamePathResolverImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamePathResolverImpl.java
Fri Jan 28 13:42:17 2011
@@ -89,7 +89,7 @@ public class NamePathResolverImpl extend
         /**
          * Returns the qualified JCR name for the given <code>Name</code>.
          * Note, that the JCR prefix is always retrieved from the NamespaceResolver
-         * even if the name is in the defaut namespace. This is a special treatement
+         * even if the name is in the default namespace. This is a special treatment
          * for query specific implementation, which defines a prefix for all namespace
          * URIs including the default namespace.
          *

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/PropertiesSynonymProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/PropertiesSynonymProvider.java?rev=1064670&r1=1064669&r2=1064670&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/PropertiesSynonymProvider.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/PropertiesSynonymProvider.java
Fri Jan 28 13:42:17 2011
@@ -130,7 +130,7 @@ public class PropertiesSynonymProvider i
         } catch (Exception e) {
             log.error("Exception while reading synonyms", e);
         }
-        // update lastCheck timestamp, even if error occured (retry later)
+        // update lastCheck timestamp, even if error occurred (retry later)
         lastCheck = System.currentTimeMillis();
     }
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WeightedHighlighter.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WeightedHighlighter.java?rev=1064670&r1=1064669&r2=1064670&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WeightedHighlighter.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WeightedHighlighter.java
Fri Jan 28 13:42:17 2011
@@ -65,7 +65,7 @@ public class WeightedHighlighter extends
      * @param excerptEnd    this string is appended to the excerpt
      * @param fragmentStart this string is prepended to every fragment
      * @param fragmentEnd   this string is appended to the end of every
-     *                      fragement.
+     *                      fragment.
      * @param hlStart       the string used to prepend a highlighted token, for
      *                      example <tt>&quot;&lt;b&gt;&quot;</tt>
      * @param hlEnd         the string used to append a highlighted token, for
@@ -112,6 +112,7 @@ public class WeightedHighlighter extends
                 START_HIGHLIGHT, END_HIGHLIGHT, maxFragments, surround);
     }
 
+    @Override
     protected String mergeFragments(TermVectorOffsetInfo[] offsets,
                                     String text,
                                     String excerptStart,
@@ -191,7 +192,7 @@ public class WeightedHighlighter extends
             TermVectorOffsetInfo lastOffsetInfo = null;
             Iterator<TermVectorOffsetInfo> fIt = fi.iterator();
             while (fIt.hasNext()) {
-                TermVectorOffsetInfo oi = (TermVectorOffsetInfo) fIt.next();
+                TermVectorOffsetInfo oi = fIt.next();
                 if (lastOffsetInfo != null) {
                     // fill in text between terms
                     sb.append(text.substring(lastOffsetInfo.getEndOffset(), oi.getStartOffset()));
@@ -345,6 +346,7 @@ public class WeightedHighlighter extends
          * is considered the lesser. This will result in a queue that keeps the
          * {@link FragmentInfo} with the best quality.
          */
+        @Override
         protected boolean lessThan(Object a, Object b) {
             FragmentInfo infoA = (FragmentInfo) a;
             FragmentInfo infoB = (FragmentInfo) b;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/QueryEngine.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/QueryEngine.java?rev=1064670&r1=1064669&r2=1064670&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/QueryEngine.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/QueryEngine.java
Fri Jan 28 13:42:17 2011
@@ -191,9 +191,9 @@ public class QueryEngine {
                         Constraints.or(qomFactory, rightConstraints.subList(
                                 i, Math.min(i + 500, rightConstraints.size()))),
                         splitter.getRightConstraint());
-                QueryResult rigthResult =
+                QueryResult rightResult =
                     execute(null, right, rightConstraint, null, 0, -1);
-                for (Row row : JcrUtils.getRows(rigthResult)) {
+                for (Row row : JcrUtils.getRows(rightResult)) {
                     list.add(row);
                 }
             }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/ScoreNodeMap.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/ScoreNodeMap.java?rev=1064670&r1=1064669&r2=1064670&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/ScoreNodeMap.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/ScoreNodeMap.java
Fri Jan 28 13:42:17 2011
@@ -37,11 +37,11 @@ public final class ScoreNodeMap {
     /**
      * Adds <code>scoreNodes</code> to this map under the given <code>key</code>.
      * If there already exists a mapping with the given <code>key</code> the
-     * <code>scoreNodes</code> are added to the existingmapping. The add
+     * <code>scoreNodes</code> are added to the existing mapping. The add
      * operation works as follows:
      * <ul>
      * <li>If the existing value for <code>key</code> is a <code>ScoreNode[]</code>,
-     * then the value is turned into a <code>List</code> and the exising value
+     * then the value is turned into a <code>List</code> and the existing value
      * as well as the new value are added to the <code>List</code>. Finally
      * the <code>List</code> is uses as the new value for the mapping.
      * </li>



Mime
View raw message