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

[<fg...@us...>]

Revision: 1080
          http://openutils.svn.sourceforge.net/openutils/?rev=1080&view=rev
Author:   fgrilli
Date:     2009-03-06 21:56:58 +0000 (Fri, 06 Mar 2009)

Log Message:
-----------
moved checks on ItemType in AbstractMagnoliaCriteriaImpl

Modified Paths:
--------------
    trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractMagnoliaCriteriaImpl.java
    trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaImpl.java
    trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java

Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractMagnoliaCriteriaImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractMagnoliaCriteriaImpl.java	2009-03-06 21:49:34 UTC (rev 1079)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractMagnoliaCriteriaImpl.java	2009-03-06 21:56:58 UTC (rev 1080)
@@ -1,7 +1,10 @@
 package net.sourceforge.openutils.mgnlcriteria.jcr.query.xpath.impl;
 
+import org.apache.commons.lang.StringUtils;
+
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.xpath.utils.XPathTextUtils;
 import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.ItemType;
 import info.magnolia.cms.core.search.QueryManager;
 
 
@@ -24,7 +27,10 @@
     protected AbstractMagnoliaCriteriaImpl(String path, QueryManager queryManager, String itemType, Class< ? > classType)
     {
         super();
-        this.itemType = itemType;
+        if (StringUtils.isBlank(this.itemType))
+            this.itemType = ItemType.CONTENT.getSystemName();
+        else
+            this.itemType = itemType;
         this.path = XPathTextUtils.encodeDigitsInPath(path);
         this.queryManager = queryManager;
         // defaults to info.magnolia.cms.core.Content

Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaImpl.java	2009-03-06 21:49:34 UTC (rev 1079)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaImpl.java	2009-03-06 21:56:58 UTC (rev 1080)
@@ -1,7 +1,6 @@
 package net.sourceforge.openutils.mgnlcriteria.jcr.query.xpath.impl;
 
 import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.ItemType;
 import info.magnolia.cms.core.search.Query;
 import info.magnolia.cms.core.search.QueryManager;
 import info.magnolia.cms.core.search.QueryResult;
@@ -20,9 +19,7 @@
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRQueryException;
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.xpath.XPathSelect;
 
-import org.apache.commons.lang.StringUtils;
 
-
 /**
  * Magnolia XPATH implementation of the <tt>Criteria</tt> interface
  * @author Federico Grilli
@@ -36,21 +33,11 @@
     public MagnoliaCriteriaImpl(String path, QueryManager queryManager, String itemType)
     {
         super(path, queryManager, itemType, null);
-
-        if (StringUtils.isBlank(this.itemType))
-            this.itemType = ItemType.CONTENT.getSystemName();
-        else
-            this.itemType = itemType;
     }
 
     public MagnoliaCriteriaImpl(String path, QueryManager queryManager, String itemType, Class< ? > classType)
     {
         super(path, queryManager, itemType, classType);
-
-        if (StringUtils.isBlank(this.itemType))
-            this.itemType = ItemType.CONTENT.getSystemName();
-        else
-            this.itemType = itemType;
     }
 
     @SuppressWarnings("unchecked")

Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java	2009-03-06 21:49:34 UTC (rev 1079)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java	2009-03-06 21:56:58 UTC (rev 1080)
@@ -47,21 +47,11 @@
     public MagnoliaCriteriaWithLimitImpl(String path, QueryManager queryManager, String itemType)
     {
         super(path, queryManager, itemType, null);
-
-        if (StringUtils.isBlank(this.itemType))
-            this.itemType = ItemType.CONTENT.getSystemName();
-        else
-            this.itemType = itemType;
     }
 
     public MagnoliaCriteriaWithLimitImpl(String path, QueryManager queryManager, String itemType, Class< ? > classType)
     {
         super(path, queryManager, itemType, classType);
-
-        if (StringUtils.isBlank(this.itemType))
-            this.itemType = ItemType.CONTENT.getSystemName();
-        else
-            this.itemType = itemType;
     }
 
     @SuppressWarnings("unchecked")


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