jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r615661 [2/2] - in /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core: cluster/ journal/ nodetype/jsr283/ persistence/bundle/ persistence/bundle/util/ query/ query/jsr283/ query/jsr283/qom/ query/lucene/ query/qom/ s...
Date Sun, 27 Jan 2008 22:00:42 GMT
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/qom/QueryObjectModelFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/qom/QueryObjectModelFactory.java?rev=615661&r1=615660&r2=615661&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/qom/QueryObjectModelFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/qom/QueryObjectModelFactory.java Sun Jan 27 14:00:38 2008
@@ -29,8 +29,8 @@
  *
  * @since JCR 2.0
  */
-public interface QueryObjectModelFactory
-        extends QueryObjectModelConstants {
+public interface QueryObjectModelFactory extends QueryObjectModelConstants {
+
     ///
     /// QUERY
     ///
@@ -50,11 +50,10 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public QueryObjectModel createQuery
-            (Selector selector,
-             Constraint constraint,
-             Ordering[] orderings,
-             Column[] columns) throws InvalidQueryException, RepositoryException;
+    QueryObjectModel createQuery(
+            Selector selector, Constraint constraint,
+            Ordering[] orderings, Column[] columns)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Creates a query with one or more selectors.
@@ -73,11 +72,10 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public QueryObjectModel createQuery
-            (Source source,
-             Constraint constraint,
-             Ordering[] orderings,
-             Column[] columns) throws InvalidQueryException, RepositoryException;
+    QueryObjectModel createQuery(
+            Source source, Constraint constraint,
+            Ordering[] orderings, Column[] columns)
+        throws InvalidQueryException, RepositoryException;
 
     ///
     /// SELECTOR
@@ -93,8 +91,8 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public Selector selector(String nodeTypeName)
-            throws InvalidQueryException, RepositoryException;
+    Selector selector(String nodeTypeName)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Selects a subset of the nodes in the repository based on node type.
@@ -105,8 +103,8 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public Selector selector(String nodeTypeName, String selectorName)
-            throws InvalidQueryException, RepositoryException;
+    Selector selector(String nodeTypeName, String selectorName)
+        throws InvalidQueryException, RepositoryException;
 
     ///
     /// JOIN
@@ -119,20 +117,19 @@
      * @param right         the right node-tuple source; non-null
      * @param joinType      either
      *                      <ul>
-     *                      <li>{@link org.apache.jackrabbit.core.query.jsr283.qom.QueryObjectModelConstants#JOIN_TYPE_INNER},</li>
-     *                      <li>{@link org.apache.jackrabbit.core.query.jsr283.qom.QueryObjectModelConstants#JOIN_TYPE_LEFT_OUTER},</li>
-     *                      <li>{@link org.apache.jackrabbit.core.query.jsr283.qom.QueryObjectModelConstants#JOIN_TYPE_RIGHT_OUTER}</li>
+     *                      <li>{@link QueryObjectModelConstants#JOIN_TYPE_INNER},</li>
+     *                      <li>{@link QueryObjectModelConstants#JOIN_TYPE_LEFT_OUTER},</li>
+     *                      <li>{@link QueryObjectModelConstants#JOIN_TYPE_RIGHT_OUTER}</li>
      *                      </ul>
      * @param joinCondition the join condition; non-null
      * @return the join; non-null
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public Join join
-            (Source left,
-             Source right,
-             int joinType,
-             JoinCondition joinCondition) throws InvalidQueryException, RepositoryException;
+    Join join(
+            Source left, Source right,
+            int joinType, JoinCondition joinCondition)
+        throws InvalidQueryException, RepositoryException;
 
     ///
     /// JOINCONDITION
@@ -150,11 +147,10 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public EquiJoinCondition equiJoinCondition
-            (String selector1Name,
-             String property1Name,
-             String selector2Name,
-             String property2Name) throws InvalidQueryException, RepositoryException;
+    EquiJoinCondition equiJoinCondition(
+            String selector1Name, String property1Name,
+            String selector2Name, String property2Name)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Tests whether a first selector's node is the same as a second selector's
@@ -166,9 +162,9 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public SameNodeJoinCondition sameNodeJoinCondition
-            (String selector1Name,
-             String selector2Name) throws InvalidQueryException, RepositoryException;
+    SameNodeJoinCondition sameNodeJoinCondition(
+            String selector1Name, String selector2Name)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Tests whether a first selector's node is the same as a node identified
@@ -181,10 +177,9 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public SameNodeJoinCondition sameNodeJoinCondition
-            (String selector1Name,
-             String selector2Name,
-             String selector2Path) throws InvalidQueryException, RepositoryException;
+    SameNodeJoinCondition sameNodeJoinCondition(
+            String selector1Name, String selector2Name, String selector2Path)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Tests whether a first selector's node is a child of a second selector's
@@ -196,9 +191,9 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public ChildNodeJoinCondition childNodeJoinCondition
-            (String childSelectorName,
-             String parentSelectorName) throws InvalidQueryException, RepositoryException;
+    ChildNodeJoinCondition childNodeJoinCondition(
+            String childSelectorName, String parentSelectorName)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Tests whether a first selector's node is a descendant of a second
@@ -210,9 +205,9 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public DescendantNodeJoinCondition descendantNodeJoinCondition
-            (String descendantSelectorName,
-             String ancestorSelectorName) throws InvalidQueryException, RepositoryException;
+    DescendantNodeJoinCondition descendantNodeJoinCondition(
+            String descendantSelectorName, String ancestorSelectorName)
+        throws InvalidQueryException, RepositoryException;
 
     ///
     /// CONSTRAINT
@@ -227,8 +222,8 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public And and(Constraint constraint1, Constraint constraint2)
-            throws InvalidQueryException, RepositoryException;
+    And and(Constraint constraint1, Constraint constraint2)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Performs a logical disjunction of two other constraints.
@@ -239,8 +234,8 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public Or or(Constraint constraint1, Constraint constraint2)
-            throws InvalidQueryException, RepositoryException;
+    Or or(Constraint constraint1, Constraint constraint2)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Performs a logical negation of another constraint.
@@ -250,8 +245,8 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public Not not(Constraint constraint)
-            throws InvalidQueryException, RepositoryException;
+    Not not(Constraint constraint)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Filters node-tuples based on the outcome of a binary operation.
@@ -272,10 +267,9 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public Comparison comparison
-            (DynamicOperand operand1,
-             int operator,
-             StaticOperand operand2) throws InvalidQueryException, RepositoryException;
+    Comparison comparison(
+            DynamicOperand operand1, int operator, StaticOperand operand2)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Tests the existence of a property in the default selector.
@@ -286,8 +280,8 @@
      *                               or is otherwise invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public PropertyExistence propertyExistence(String propertyName)
-            throws InvalidQueryException, RepositoryException;
+    PropertyExistence propertyExistence(String propertyName)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Tests the existence of a property in the specified selector.
@@ -298,9 +292,9 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public PropertyExistence propertyExistence
-            (String selectorName,
-             String propertyName) throws InvalidQueryException, RepositoryException;
+    PropertyExistence propertyExistence(
+            String selectorName, String propertyName)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Performs a full-text search against the default selector.
@@ -314,9 +308,9 @@
      *                               or is otherwise invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public FullTextSearch fullTextSearch
-            (String propertyName,
-             String fullTextSearchExpression) throws InvalidQueryException, RepositoryException;
+    FullTextSearch fullTextSearch(
+            String propertyName, String fullTextSearchExpression)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Performs a full-text search against the specified selector.
@@ -330,10 +324,10 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public FullTextSearch fullTextSearch
-            (String selectorName,
-             String propertyName,
-             String fullTextSearchExpression) throws InvalidQueryException, RepositoryException;
+    FullTextSearch fullTextSearch(
+            String selectorName, String propertyName,
+            String fullTextSearchExpression)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Tests whether a node in the default selector is reachable by a specified
@@ -345,8 +339,8 @@
      *                               or is otherwise invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public SameNode sameNode(String path)
-            throws InvalidQueryException, RepositoryException;
+    SameNode sameNode(String path)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Tests whether a node in the specified selector is reachable by a specified
@@ -358,8 +352,8 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public SameNode sameNode(String selectorName, String path)
-            throws InvalidQueryException, RepositoryException;
+    SameNode sameNode(String selectorName, String path)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Tests whether a node in the default selector is a child of a node
@@ -371,8 +365,8 @@
      *                               or is otherwise invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public ChildNode childNode(String path)
-            throws InvalidQueryException, RepositoryException;
+    ChildNode childNode(String path)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Tests whether a node in the specified selector is a child of a node
@@ -384,8 +378,8 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public ChildNode childNode(String selectorName, String path)
-            throws InvalidQueryException, RepositoryException;
+    ChildNode childNode(String selectorName, String path)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Tests whether a node in the default selector is a descendant of a node
@@ -397,8 +391,8 @@
      *                               or is otherwise invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public DescendantNode descendantNode(String path)
-            throws InvalidQueryException, RepositoryException;
+    DescendantNode descendantNode(String path)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Tests whether a node in the specified selector is a descendant of a node
@@ -410,8 +404,8 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public DescendantNode descendantNode(String selectorName, String path)
-            throws InvalidQueryException, RepositoryException;
+    DescendantNode descendantNode(String selectorName, String path)
+        throws InvalidQueryException, RepositoryException;
 
     ///
     /// OPERAND
@@ -427,8 +421,8 @@
      *                               or is otherwise invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public PropertyValue propertyValue(String propertyName)
-            throws InvalidQueryException, RepositoryException;
+    PropertyValue propertyValue(String propertyName)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Evaluates to the value (or values, if multi-valued) of a property in the
@@ -440,8 +434,8 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public PropertyValue propertyValue(String selectorName, String propertyName)
-            throws InvalidQueryException, RepositoryException;
+    PropertyValue propertyValue(String selectorName, String propertyName)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Evaluates to the length (or lengths, if multi-valued) of a property.
@@ -452,8 +446,8 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public Length length(PropertyValue propertyValue)
-            throws InvalidQueryException, RepositoryException;
+    Length length(PropertyValue propertyValue)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Evaluates to a <code>NAME</code> value equal to the prefix-qualified name
@@ -464,8 +458,7 @@
      *                               or is otherwise invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public NodeName nodeName()
-            throws InvalidQueryException, RepositoryException;
+    NodeName nodeName() throws InvalidQueryException, RepositoryException;
 
     /**
      * Evaluates to a <code>NAME</code> value equal to the prefix-qualified name
@@ -476,8 +469,8 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public NodeName nodeName(String selectorName)
-            throws InvalidQueryException, RepositoryException;
+    NodeName nodeName(String selectorName)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Evaluates to a <code>NAME</code> value equal to the local (unprefixed)
@@ -488,8 +481,8 @@
      *                               or is otherwise invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public NodeLocalName nodeLocalName()
-            throws InvalidQueryException, RepositoryException;
+    NodeLocalName nodeLocalName()
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Evaluates to a <code>NAME</code> value equal to the local (unprefixed)
@@ -500,8 +493,8 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public NodeLocalName nodeLocalName(String selectorName)
-            throws InvalidQueryException, RepositoryException;
+    NodeLocalName nodeLocalName(String selectorName)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Evaluates to a <code>DOUBLE</code> value equal to the full-text search
@@ -512,8 +505,8 @@
      *                               or is otherwise invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public FullTextSearchScore fullTextSearchScore()
-            throws InvalidQueryException, RepositoryException;
+    FullTextSearchScore fullTextSearchScore()
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Evaluates to a <code>DOUBLE</code> value equal to the full-text search
@@ -524,8 +517,8 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public FullTextSearchScore fullTextSearchScore(String selectorName)
-            throws InvalidQueryException, RepositoryException;
+    FullTextSearchScore fullTextSearchScore(String selectorName)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Evaluates to the lower-case string value (or values, if multi-valued)
@@ -537,8 +530,8 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public LowerCase lowerCase(DynamicOperand operand)
-            throws InvalidQueryException, RepositoryException;
+    LowerCase lowerCase(DynamicOperand operand)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Evaluates to the upper-case string value (or values, if multi-valued)
@@ -550,8 +543,8 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public UpperCase upperCase(DynamicOperand operand)
-            throws InvalidQueryException, RepositoryException;
+    UpperCase upperCase(DynamicOperand operand)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Evaluates to the value of a bind variable.
@@ -561,8 +554,8 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public BindVariableValue bindVariable(String bindVariableName)
-            throws InvalidQueryException, RepositoryException;
+    BindVariableValue bindVariable(String bindVariableName)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Evaluates to a literal value.
@@ -572,8 +565,8 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public Literal literal(Value value)
-            throws InvalidQueryException, RepositoryException;
+    Literal literal(Value value)
+        throws InvalidQueryException, RepositoryException;
 
     ///
     /// ORDERING
@@ -587,8 +580,8 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public Ordering ascending(DynamicOperand operand)
-            throws InvalidQueryException, RepositoryException;
+    Ordering ascending(DynamicOperand operand)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Orders by the value of the specified operand, in descending order.
@@ -598,8 +591,8 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public Ordering descending(DynamicOperand operand)
-            throws InvalidQueryException, RepositoryException;
+    Ordering descending(DynamicOperand operand)
+        throws InvalidQueryException, RepositoryException;
 
     ///
     /// COLUMN
@@ -619,8 +612,8 @@
      *                               or is otherwise invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public Column column(String propertyName)
-            throws InvalidQueryException, RepositoryException;
+    Column column(String propertyName)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Identifies a property in the default selector to include in the tabular
@@ -636,8 +629,8 @@
      *                               or is otherwise invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public Column column(String propertyName, String columnName)
-            throws InvalidQueryException, RepositoryException;
+    Column column(String propertyName, String columnName)
+        throws InvalidQueryException, RepositoryException;
 
     /**
      * Identifies a property in the specified selector to include in the tabular
@@ -653,8 +646,6 @@
      * @throws InvalidQueryException if the query is invalid
      * @throws RepositoryException   if the operation otherwise fails
      */
-    public Column column
-            (String selectorName,
-             String propertyName,
-             String columnName) throws InvalidQueryException, RepositoryException;
+    Column column(String selectorName, String propertyName, String columnName)
+        throws InvalidQueryException, RepositoryException;
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/qom/SameNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/qom/SameNode.java?rev=615661&r1=615660&r2=615661&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/qom/SameNode.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/qom/SameNode.java Sun Jan 27 14:00:38 2008
@@ -38,19 +38,20 @@
  *
  * @since JCR 2.0
  */
-public interface SameNode
-        extends Constraint {
+public interface SameNode extends Constraint {
+
     /**
      * Gets the name of the selector against which to apply this constraint.
      *
      * @return the selector name; non-null
      */
-    public String getSelectorName();
+    String getSelectorName();
 
     /**
      * Gets the absolute path.
      *
      * @return the path; non-null
      */
-    public String getPath();
+    String getPath();
+
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/qom/SameNodeJoinCondition.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/qom/SameNodeJoinCondition.java?rev=615661&r1=615660&r2=615661&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/qom/SameNodeJoinCondition.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/qom/SameNodeJoinCondition.java Sun Jan 27 14:00:38 2008
@@ -55,26 +55,27 @@
  *
  * @since JCR 2.0
  */
-public interface SameNodeJoinCondition
-        extends JoinCondition {
+public interface SameNodeJoinCondition extends JoinCondition {
+
     /**
      * Gets the name of the first selector.
      *
      * @return the selector name; non-null
      */
-    public String getSelector1Name();
+    String getSelector1Name();
 
     /**
      * Gets the name of the second selector.
      *
      * @return the selector name; non-null
      */
-    public String getSelector2Name();
+    String getSelector2Name();
 
     /**
      * Gets the path relative to the second selector.
      *
      * @return the relative path, or null for none
      */
-    public String getSelector2Path();
+    String getSelector2Path();
+
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/qom/Selector.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/qom/Selector.java?rev=615661&r1=615660&r2=615661&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/qom/Selector.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/qom/Selector.java Sun Jan 27 14:00:38 2008
@@ -45,14 +45,14 @@
  *
  * @since JCR 2.0
  */
-public interface Selector
-        extends Source {
+public interface Selector extends Source {
+
     /**
      * Gets the name of the required node type.
      *
      * @return the node type name; non-null
      */
-    public String getNodeTypeName();
+    String getNodeTypeName();
 
     /**
      * Gets the selector name.
@@ -62,5 +62,6 @@
      *
      * @return the selector name; non-null
      */
-    public String getSelectorName();
+    String getSelectorName();
+
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/qom/UpperCase.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/qom/UpperCase.java?rev=615661&r1=615660&r2=615661&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/qom/UpperCase.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/jsr283/qom/UpperCase.java Sun Jan 27 14:00:38 2008
@@ -30,12 +30,13 @@
  *
  * @since JCR 2.0
  */
-public interface UpperCase
-        extends DynamicOperand {
+public interface UpperCase extends DynamicOperand {
+
     /**
      * Gets the operand whose value is converted to a upper-case string.
      *
      * @return the operand; non-null
      */
-    public DynamicOperand getOperand();
+    DynamicOperand getOperand();
+
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ExcerptProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ExcerptProvider.java?rev=615661&r1=615660&r2=615661&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ExcerptProvider.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ExcerptProvider.java Sun Jan 27 14:00:38 2008
@@ -32,7 +32,8 @@
     /**
      * Name of the rep:excerpt function.
      */
-    public final Name REP_EXCERPT = NameFactoryImpl.getInstance().create(Name.NS_REP_URI, "excerpt(.)");
+    Name REP_EXCERPT = NameFactoryImpl.getInstance().create(
+            Name.NS_REP_URI, "excerpt(.)");
 
     /**
      * Initializes this excerpt provider.
@@ -42,7 +43,7 @@
      * @throws IOException if an error occurs while initializing this excerpt
      *                     provider.
      */
-    public void init(Query query, SearchIndex index) throws IOException;
+    void init(Query query, SearchIndex index) throws IOException;
 
     /**
      * Returns the XML excerpt for the node with <code>id</code>.
@@ -54,6 +55,7 @@
      *         <code>id</code>.
      * @throws IOException if an error occurs while creating the excerpt.
      */
-    public String getExcerpt(NodeId id, int maxFragments, int maxFragmentSize)
-            throws IOException;
+    String getExcerpt(NodeId id, int maxFragments, int maxFragmentSize)
+        throws IOException;
+
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/HighlightingExcerptProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/HighlightingExcerptProvider.java?rev=615661&r1=615660&r2=615661&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/HighlightingExcerptProvider.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/HighlightingExcerptProvider.java Sun Jan 27 14:00:38 2008
@@ -32,6 +32,6 @@
      * @return the highlighted text.
      * @throws IOException if an error occurs while highlighting the text.
      */
-    public String highlight(String text)
-            throws IOException;
+    String highlight(String text) throws IOException;
+
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfiguration.java?rev=615661&r1=615660&r2=615661&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfiguration.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfiguration.java Sun Jan 27 14:00:38 2008
@@ -33,7 +33,7 @@
     /**
      * The default boost: 1.0f.
      */
-    public static final float DEFAULT_BOOST = 1.0f;
+    float DEFAULT_BOOST = 1.0f;
 
     /**
      * Initializes the configuration.
@@ -43,7 +43,7 @@
      * @param namespaceMappings the namespaceMappings.
      * @throws Exception if initialization fails.
      */
-    public void init(Element config, QueryHandlerContext context, NamespaceMappings namespaceMappings) throws Exception;
+    void init(Element config, QueryHandlerContext context, NamespaceMappings namespaceMappings) throws Exception;
 
     /**
      * Returns the configured indexing aggregate rules or <code>null</code> if
@@ -51,7 +51,7 @@
      *
      * @return the configured rules or <code>null</code> if none exist.
      */
-    public AggregateRule[] getAggregateRules();
+    AggregateRule[] getAggregateRules();
 
     /**
      * Returns <code>true</code> if the property with the given name is indexed

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java?rev=615661&r1=615660&r2=615661&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java Sun Jan 27 14:00:38 2008
@@ -1114,7 +1114,7 @@
      * @param field
      * @return Query that matches all nodes that have a property named 'field'
      */
-    private final Query createMatchAllQuery(String field) {
+    private Query createMatchAllQuery(String field) {
         if (indexFormatVersion.getVersion() >= IndexFormatVersion.V2.getVersion()) {
             // new index format style
             return new TermQuery(new Term(FieldNames.PROPERTIES_SET, field));

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndexReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndexReader.java?rev=615661&r1=615660&r2=615661&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndexReader.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndexReader.java Sun Jan 27 14:00:38 2008
@@ -31,7 +31,7 @@
      * @return the <code>IndexReader</code>s that are contained in this
      *         <code>MultiIndexReader</code>.
      */
-    public IndexReader[] getIndexReaders();
+    IndexReader[] getIndexReaders();
 
     /**
      * Creates a document id for the given <code>uuid</code>.
@@ -41,7 +41,7 @@
      *         with the given <code>uuid</code>.
      * @throws IOException if an error occurs while reading from the index.
      */
-    public ForeignSegmentDocId createDocId(UUID uuid) throws IOException;
+    ForeignSegmentDocId createDocId(UUID uuid) throws IOException;
 
     /**
      * Returns the document number for the passed <code>docId</code>. If the id
@@ -52,5 +52,6 @@
      *         does not exist).
      * @throws IOException if an error occurs while reading from the index.
      */
-    public int getDocumentNumber(ForeignSegmentDocId docId) throws IOException;
+    int getDocumentNumber(ForeignSegmentDocId docId) throws IOException;
+
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamespaceMappings.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamespaceMappings.java?rev=615661&r1=615660&r2=615661&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamespaceMappings.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamespaceMappings.java Sun Jan 27 14:00:38 2008
@@ -34,5 +34,6 @@
      * @param qName     the property name to translate
      * @return the translated JCR property name
      */
-    public String translatePropertyName(Name qName) throws IllegalNameException;
+    String translatePropertyName(Name qName) throws IllegalNameException;
+
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SpellChecker.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SpellChecker.java?rev=615661&r1=615660&r2=615661&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SpellChecker.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SpellChecker.java Sun Jan 27 14:00:38 2008
@@ -34,7 +34,7 @@
      * @throws IOException if an error occurs while initializing the spell
      *                     checker.
      */
-    public void init(QueryHandler handler) throws IOException;
+    void init(QueryHandler handler) throws IOException;
 
     /**
      * Runs the spell checker over the first spellcheck relation query node in
@@ -49,10 +49,11 @@
      *         determines that the fulltext query statement is spelled
      *         correctly.
      */
-    public String check(QueryRootNode aqt) throws IOException;
+    String check(QueryRootNode aqt) throws IOException;
 
     /**
      * Closes this spell checker and allows it to free resources.
      */
-    public void close();
+    void close();
+
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SynonymProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SynonymProvider.java?rev=615661&r1=615660&r2=615661&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SynonymProvider.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SynonymProvider.java Sun Jan 27 14:00:38 2008
@@ -37,7 +37,7 @@
      * @throws IOException if an error occurs while initializing the synonym
      *                     provider.
      */
-    public void initialize(FileSystemResource fsr) throws IOException;
+    void initialize(FileSystemResource fsr) throws IOException;
 
     /**
      * Returns an array of terms that are considered synonyms for the given
@@ -47,5 +47,6 @@
      * @return an array of synonyms for the given <code>term</code> or an empty
      *         array if no synonyms are known.
      */
-    public String[] getSynonyms(String term);
+    String[] getSynonyms(String term);
+
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/TransformConstants.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/TransformConstants.java?rev=615661&r1=615660&r2=615661&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/TransformConstants.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/TransformConstants.java Sun Jan 27 14:00:38 2008
@@ -24,16 +24,16 @@
     /**
      * No transformation is done on the term enum.
      */
-    static final int TRANSFORM_NONE = 0;
+    int TRANSFORM_NONE = 0;
 
     /**
      * The underlying term enum is transformed to lower case characters.
      */
-    static final int TRANSFORM_LOWER_CASE = 1;
+    int TRANSFORM_LOWER_CASE = 1;
 
     /**
      * The underlying term enum is transformed to upper case characters.
      */
-    static final int TRANSFORM_UPPER_CASE = 2;
+    int TRANSFORM_UPPER_CASE = 2;
 
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/Transformable.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/Transformable.java?rev=615661&r1=615660&r2=615661&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/Transformable.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/Transformable.java Sun Jan 27 14:00:38 2008
@@ -31,5 +31,6 @@
      * </ul>
      * @param transformation a transform constant.
      */
-    public void setTransformation(int transformation);
+    void setTransformation(int transformation);
+
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QOMTreeVisitor.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QOMTreeVisitor.java?rev=615661&r1=615660&r2=615661&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QOMTreeVisitor.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QOMTreeVisitor.java Sun Jan 27 14:00:38 2008
@@ -21,57 +21,58 @@
  */
 public interface QOMTreeVisitor {
 
-    public Object visit(AndImpl node, Object data) throws Exception;
+    Object visit(AndImpl node, Object data) throws Exception;
 
-    public Object visit(BindVariableValueImpl node, Object data) throws Exception;
+    Object visit(BindVariableValueImpl node, Object data) throws Exception;
 
-    public Object visit(ChildNodeImpl node, Object data) throws Exception;
+    Object visit(ChildNodeImpl node, Object data) throws Exception;
 
-    public Object visit(ChildNodeJoinConditionImpl node, Object data) throws Exception;
+    Object visit(ChildNodeJoinConditionImpl node, Object data) throws Exception;
 
-    public Object visit(ColumnImpl node, Object data) throws Exception;
+    Object visit(ColumnImpl node, Object data) throws Exception;
 
-    public Object visit(ComparisonImpl node, Object data) throws Exception;
+    Object visit(ComparisonImpl node, Object data) throws Exception;
 
-    public Object visit(DescendantNodeImpl node, Object data) throws Exception;
+    Object visit(DescendantNodeImpl node, Object data) throws Exception;
 
-    public Object visit(DescendantNodeJoinConditionImpl node, Object data) throws Exception;
+    Object visit(DescendantNodeJoinConditionImpl node, Object data) throws Exception;
 
-    public Object visit(EquiJoinConditionImpl node, Object data) throws Exception;
+    Object visit(EquiJoinConditionImpl node, Object data) throws Exception;
 
-    public Object visit(FullTextSearchImpl node, Object data) throws Exception;
+    Object visit(FullTextSearchImpl node, Object data) throws Exception;
 
-    public Object visit(FullTextSearchScoreImpl node, Object data) throws Exception;
+    Object visit(FullTextSearchScoreImpl node, Object data) throws Exception;
 
-    public Object visit(JoinImpl node, Object data) throws Exception;
+    Object visit(JoinImpl node, Object data) throws Exception;
 
-    public Object visit(LengthImpl node, Object data) throws Exception;
+    Object visit(LengthImpl node, Object data) throws Exception;
 
-    public Object visit(LiteralImpl node, Object data) throws Exception;
+    Object visit(LiteralImpl node, Object data) throws Exception;
 
-    public Object visit(LowerCaseImpl node, Object data) throws Exception;
+    Object visit(LowerCaseImpl node, Object data) throws Exception;
 
-    public Object visit(NodeLocalNameImpl node, Object data) throws Exception;
+    Object visit(NodeLocalNameImpl node, Object data) throws Exception;
 
-    public Object visit(NodeNameImpl node, Object data) throws Exception;
+    Object visit(NodeNameImpl node, Object data) throws Exception;
 
-    public Object visit(NotImpl node, Object data) throws Exception;
+    Object visit(NotImpl node, Object data) throws Exception;
 
-    public Object visit(OrderingImpl node, Object data) throws Exception;
+    Object visit(OrderingImpl node, Object data) throws Exception;
 
-    public Object visit(OrImpl node, Object data) throws Exception;
+    Object visit(OrImpl node, Object data) throws Exception;
 
-    public Object visit(PropertyExistenceImpl node, Object data) throws Exception;
+    Object visit(PropertyExistenceImpl node, Object data) throws Exception;
 
-    public Object visit(PropertyValueImpl node, Object data) throws Exception;
+    Object visit(PropertyValueImpl node, Object data) throws Exception;
 
-    public Object visit(QueryObjectModelTree node, Object data) throws Exception;
+    Object visit(QueryObjectModelTree node, Object data) throws Exception;
 
-    public Object visit(SameNodeImpl node, Object data) throws Exception;
+    Object visit(SameNodeImpl node, Object data) throws Exception;
 
-    public Object visit(SameNodeJoinConditionImpl node, Object data) throws Exception;
+    Object visit(SameNodeJoinConditionImpl node, Object data) throws Exception;
 
-    public Object visit(SelectorImpl node, Object data) throws Exception;
+    Object visit(SelectorImpl node, Object data) throws Exception;
+
+    Object visit(UpperCaseImpl node, Object data) throws Exception;
 
-    public Object visit(UpperCaseImpl node, Object data) throws Exception;
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/CacheAccessListener.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/CacheAccessListener.java?rev=615661&r1=615660&r2=615661&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/CacheAccessListener.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/CacheAccessListener.java Sun Jan 27 14:00:38 2008
@@ -25,7 +25,7 @@
     /**
      * The access listener is only called each x accesses.
      */
-    static final int ACCESS_INTERVAL = 127;
+    int ACCESS_INTERVAL = 127;
 
     /**
      * The cache calls this method after a number of accessed.

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ISMLocking.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ISMLocking.java?rev=615661&r1=615660&r2=615661&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ISMLocking.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ISMLocking.java Sun Jan 27 14:00:38 2008
@@ -47,7 +47,7 @@
      * Acquire a read lock for the given item <code>id</code>.
      * @param id an item id.
      */
-    public ReadLock acquireReadLock(ItemId id) throws InterruptedException;
+    ReadLock acquireReadLock(ItemId id) throws InterruptedException;
 
     /**
      * Acquires a write lock for the given <code>changeLog</code>.
@@ -57,16 +57,15 @@
      * @throws InterruptedException if the thread is interrupted while creating
      *                              the write lock.
      */
-    public WriteLock acquireWriteLock(ChangeLog changeLog)
-            throws InterruptedException;
-
+    WriteLock acquireWriteLock(ChangeLog changeLog) throws InterruptedException;
 
     public interface ReadLock {
 
         /**
          * Releases this lock.
          */
-        public void release();
+        void release();
+
     }
 
     public interface WriteLock {
@@ -74,7 +73,7 @@
         /**
          * Releases this lock.
          */
-        public void release();
+        void release();
 
         /**
          * Downgrades this lock into a read lock. When this method returns this
@@ -85,6 +84,8 @@
          * @throws InterruptedException if the current thread is interrupted
          *                              while downgrading the write lock.
          */
-        public ReadLock downgrade() throws InterruptedException;
+        ReadLock downgrade() throws InterruptedException;
+
     }
+
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/virtual/VirtualItemStateProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/virtual/VirtualItemStateProvider.java?rev=615661&r1=615660&r2=615661&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/virtual/VirtualItemStateProvider.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/virtual/VirtualItemStateProvider.java Sun Jan 27 14:00:38 2008
@@ -88,12 +88,13 @@
      * Add an <code>ItemStateListener</code>
      * @param listener the new listener to be informed on modifications
      */
-    public void addListener(ItemStateListener listener);
+    void addListener(ItemStateListener listener);
 
     /**
      * Remove an <code>ItemStateListener</code>
      *
      * @param listener an existing listener
      */
-    public void removeListener(ItemStateListener listener);
+    void removeListener(ItemStateListener listener);
+
 }



Mime
View raw message