[Openutils-svn] SF.net SVN: openutils:[2412] trunk/openutils-mgnlcriteria/src/main/java/net /sourceforge/openutils/mgnlcriteria/jcr/query

[<die...@us...>]

Revision: 2412
          http://openutils.svn.sourceforge.net/openutils/?rev=2412&view=rev
Author:   diego_schivo
Date:     2010-05-12 15:01:24 +0000 (Wed, 12 May 2010)

Log Message:
-----------
CRIT-11 AbstractCriteriaImpl

Modified Paths:
--------------
    trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java
    trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java

Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java	2010-05-12 14:03:44 UTC (rev 2411)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/Criteria.java	2010-05-12 15:01:24 UTC (rev 2412)
@@ -155,13 +155,34 @@
     @Deprecated
     Collection< ? > list() throws JCRQueryException;
 
+    /**
+     * 
+     * @param path
+     * @return
+     */
     Criteria setBasePath(String path);
 
+    /**
+     * 
+     * @param itemsPerPage
+     * @param pageNumberStartingFromOne
+     * @return
+     */
     Criteria setPaging(int itemsPerPage, int pageNumberStartingFromOne);
 
-    Criteria setSpellCheckString(String path);
+    /**
+     * 
+     * @param spellCheckString
+     * @return
+     */
+    Criteria setSpellCheckString(String spellCheckString);
 
-    Criteria setWorkspace(String path);
+    /**
+     * 
+     * @param path
+     * @return
+     */
+    Criteria setWorkspace(String workspace);
 
     /**
      * Returns the generated xpath expression

Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java	2010-05-12 14:03:44 UTC (rev 2411)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java	2010-05-12 15:01:24 UTC (rev 2412)
@@ -82,62 +82,93 @@
         this.hm = hm;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public Collection<CriterionEntry> getCriterionEntries()
     {
         return Collections.unmodifiableCollection(criterionEntries);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public Collection<OrderEntry> getOrderEntries()
     {
         return Collections.unmodifiableCollection(orderEntries);
     }
 
-    public Criteria add(Criteria criteriaInst, Criterion expression)
+    /**
+     * {@inheritDoc}
+     */
+    public Criteria add(Criterion criterion)
     {
-        criterionEntries.add(new CriterionEntry(expression, criteriaInst));
+        criterionEntries.add(new CriterionEntry(criterion, this));
         return this;
     }
 
-    public Criteria add(Criterion expression)
+    /**
+     * {@inheritDoc}
+     */
+    public Criteria addOrder(Order order)
     {
-        add(this, expression);
+        orderEntries.add(new OrderEntry(order, this));
         return this;
     }
 
-    public Criteria addOrder(Order ordering)
+    /**
+     * {@inheritDoc}
+     */
+    public Criteria setBasePath(String path)
     {
-        orderEntries.add(new OrderEntry(ordering, this));
+        this.path = StringUtils.defaultIfEmpty(path, "//*");
         return this;
     }
 
-    public Integer getMaxResults()
+    /**
+     * Returns the firstResult.
+     * @return the firstResult
+     */
+    public int getFirstResult()
     {
-        return maxResults;
+        return offset;
     }
 
-    public Criteria setMaxResults(int maxResults)
+    /**
+     * {@inheritDoc}
+     */
+    public Criteria setFirstResult(int firstResult)
     {
-        this.maxResults = maxResults;
+        this.offset = firstResult;
         return this;
     }
 
-    public Integer getFirstResult()
+    
+    /**
+     * Returns the maxResults.
+     * @return the maxResults
+     */
+    public int getMaxResults()
     {
-        return offset;
+        return maxResults;
     }
 
-    public Criteria setFirstResult(int firstResult)
+    /**
+     * {@inheritDoc}
+     */
+    public Criteria setMaxResults(int maxResults)
     {
-        this.offset = firstResult;
+        this.maxResults = maxResults;
         return this;
     }
 
     /**
      * {@inheritDoc}
      */
-    public Criteria setBasePath(String path)
+    public Criteria setPaging(int itemsPerPage, int pageNumberStartingFromOne)
     {
-        this.path = StringUtils.defaultIfEmpty(path, "//*");
+        this.maxResults = itemsPerPage;
+        this.offset = (Math.max(pageNumberStartingFromOne, 1) - 1) * maxResults;
         return this;
     }
 
@@ -159,15 +190,8 @@
         return this;
     }
 
-    public Criteria setPaging(int itemsPerPage, int pageNumberStartingFromOne)
-    {
-        this.maxResults = itemsPerPage;
-        this.offset = (Math.max(pageNumberStartingFromOne, 1) - 1) * maxResults;
-        return this;
-    }
-
     /**
-     * @return
+     * {@inheritDoc}
      */
     public String toXpathExpression()
     {
@@ -185,7 +209,6 @@
      */
     public AdvancedResult execute()
     {
-
         String language = javax.jcr.query.Query.XPATH;
         String stmt = toXpathExpression();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.