From: <fg...@us...> - 2010-08-19 09:25:48
|
Revision: 2854 http://openutils.svn.sourceforge.net/openutils/?rev=2854&view=rev Author: fgiust Date: 2010-08-19 09:25:38 +0000 (Thu, 19 Aug 2010) Log Message: ----------- formatting only Modified Paths: -------------- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ExecutableQuery.java trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIterator.java trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/TranslatableCriteria.java trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java 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/MagnoliaCriteriaWithLimitImpl.java trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java trunk/openutils-mgnlcriteria/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryDecoratorSupport.java trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java =================================================================== --- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2010-08-19 09:19:37 UTC (rev 2853) +++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2010-08-19 09:25:38 UTC (rev 2854) @@ -37,8 +37,7 @@ { /** - * Local variable storing the next accessible result. - * Method hasNext() fetches it, method next() resets it. + * Local variable storing the next accessible result. Method hasNext() fetches it, method next() resets it. */ private AdvancedResultItem next; Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java =================================================================== --- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2010-08-19 09:19:37 UTC (rev 2853) +++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2010-08-19 09:25:38 UTC (rev 2854) @@ -118,8 +118,8 @@ */ public int getNumberOfPages() { - return itemsPerPage > 0 ? (int) Math.round(Math - .ceil(((float) jcrQueryResult.getTotalSize() / (float) itemsPerPage))) : 1; + return itemsPerPage > 0 ? (int) Math + .round(Math.ceil(((float) jcrQueryResult.getTotalSize() / (float) itemsPerPage))) : 1; } /** Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java =================================================================== --- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java 2010-08-19 09:19:37 UTC (rev 2853) +++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/QueryExecutorHelper.java 2010-08-19 09:25:38 UTC (rev 2854) @@ -92,9 +92,11 @@ if (StringUtils.isNotBlank(spellCheckString)) { - spellCheckerQuery = jcrQueryManager.createQuery("/jcr:root[rep:spellcheck('" - + XPathTextUtils.stringToJCRSearchExp(spellCheckString) - + "')]/(rep:spellcheck())", Query.XPATH); + spellCheckerQuery = jcrQueryManager.createQuery( + "/jcr:root[rep:spellcheck('" + + XPathTextUtils.stringToJCRSearchExp(spellCheckString) + + "')]/(rep:spellcheck())", + Query.XPATH); } return new AdvancedResultImpl( Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java =================================================================== --- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java 2010-08-19 09:19:37 UTC (rev 2853) +++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java 2010-08-19 09:25:38 UTC (rev 2854) @@ -19,7 +19,6 @@ package net.sourceforge.openutils.mgnlcriteria.jcr.query; -import java.util.Iterator; /** Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ExecutableQuery.java =================================================================== --- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ExecutableQuery.java 2010-08-19 09:19:37 UTC (rev 2853) +++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ExecutableQuery.java 2010-08-19 09:25:38 UTC (rev 2854) @@ -19,7 +19,6 @@ package net.sourceforge.openutils.mgnlcriteria.jcr.query; - /** * @author fgiust * @version $Id$ Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIterator.java =================================================================== --- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIterator.java 2010-08-19 09:19:37 UTC (rev 2853) +++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/ResultIterator.java 2010-08-19 09:25:38 UTC (rev 2854) @@ -97,7 +97,7 @@ /** * Transforms a Row instance, adapting it to a specific type. - * @param row + * @param row * @return a transformed version */ protected abstract T wrap(Row row); Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/TranslatableCriteria.java =================================================================== --- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/TranslatableCriteria.java 2010-08-19 09:19:37 UTC (rev 2853) +++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/TranslatableCriteria.java 2010-08-19 09:25:38 UTC (rev 2854) @@ -41,7 +41,7 @@ Collection<OrderEntry> getOrderEntries(); /** - * Gets the Order entries of this Criteria instance. + * Gets the Order entries of this Criteria instance. * @return a collection of Criterion entries */ Collection<CriterionEntry> getCriterionEntries(); Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java =================================================================== --- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java 2010-08-19 09:19:37 UTC (rev 2853) +++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java 2010-08-19 09:25:38 UTC (rev 2854) @@ -39,8 +39,9 @@ { private static final Calendar MIDNIGHT_GMT; - - static { + + static + { MIDNIGHT_GMT = Calendar.getInstance(TimeZone.getTimeZone("GMT")); MIDNIGHT_GMT.set(Calendar.HOUR_OF_DAY, 0); MIDNIGHT_GMT.set(Calendar.MINUTE, 0); @@ -66,7 +67,6 @@ } /** - * * @param nodeName * @param value * @return @@ -264,7 +264,6 @@ } /** - * * @param nodeName * @param lo * @param hi Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java =================================================================== --- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java 2010-08-19 09:19:37 UTC (rev 2853) +++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclQueryDecorator.java 2010-08-19 09:25:38 UTC (rev 2854) @@ -35,8 +35,8 @@ import org.apache.jackrabbit.core.query.lucene.MatchAllDocsQuery; import org.apache.jackrabbit.core.query.lucene.QueryDecoratorSupport; import org.apache.jackrabbit.core.query.lucene.SearchIndex; -import org.apache.lucene.search.Query; import org.apache.lucene.search.BooleanClause.Occur; +import org.apache.lucene.search.Query; /** @@ -95,9 +95,7 @@ Occur o = (permission.getPermissions() & Permission.READ) != 0 ? Occur.MUST : Occur.MUST_NOT; - aclQueries.add(new Object[]{ - q, o - }); + aclQueries.add(new Object[]{q, o }); } } } 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-08-19 09:19:37 UTC (rev 2853) +++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java 2010-08-19 09:25:38 UTC (rev 2854) @@ -161,7 +161,6 @@ return this; } - /** * Returns the maxResults. * @return the maxResults @@ -230,8 +229,13 @@ String language = javax.jcr.query.Query.XPATH; String stmt = toXpathExpression(); - return QueryExecutorHelper.execute(stmt, language, this.hm != null ? this.hm : MgnlContext - .getHierarchyManager(workspace), maxResults, offset, spellCheckString); + return QueryExecutorHelper.execute( + stmt, + language, + this.hm != null ? this.hm : MgnlContext.getHierarchyManager(workspace), + maxResults, + offset, + spellCheckString); } } \ No newline at end of file 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 2010-08-19 09:19:37 UTC (rev 2853) +++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java 2010-08-19 09:25:38 UTC (rev 2854) @@ -271,13 +271,15 @@ } catch (RepositoryException re) { - log.error("{} caught while iterating on query results: {}", re.getClass().getName(), re - .getMessage()); + log.error( + "{} caught while iterating on query results: {}", + re.getClass().getName(), + re.getMessage()); if (log.isDebugEnabled()) { - log.debug(re.getClass().getName() - + " caught while iterating on query results: " - + re.getMessage(), re); + log.debug( + re.getClass().getName() + " caught while iterating on query results: " + re.getMessage(), + re); } } } Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java =================================================================== --- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java 2010-08-19 09:19:37 UTC (rev 2853) +++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/utils/XPathTextUtils.java 2010-08-19 09:25:38 UTC (rev 2854) @@ -20,7 +20,6 @@ package net.sourceforge.openutils.mgnlcriteria.jcr.query.xpath.utils; import org.apache.commons.lang.StringUtils; -import org.apache.lucene.queryParser.QueryParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: trunk/openutils-mgnlcriteria/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryDecoratorSupport.java =================================================================== --- trunk/openutils-mgnlcriteria/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryDecoratorSupport.java 2010-08-19 09:19:37 UTC (rev 2853) +++ trunk/openutils-mgnlcriteria/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryDecoratorSupport.java 2010-08-19 09:25:38 UTC (rev 2854) @@ -21,9 +21,9 @@ import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; import org.apache.lucene.index.Term; +import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Query; -import org.apache.lucene.search.BooleanClause.Occur; /** @@ -45,8 +45,10 @@ protected Query nameQuery(String n) { - return new NameQuery(NameFactoryImpl.getInstance().create("", n), index.getIndexFormatVersion(), index - .getNamespaceMappings()); + return new NameQuery( + NameFactoryImpl.getInstance().create("", n), + index.getIndexFormatVersion(), + index.getNamespaceMappings()); } protected Query jackrabbitTermQuery(String f) Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java =================================================================== --- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java 2010-08-19 09:19:37 UTC (rev 2853) +++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java 2010-08-19 09:25:38 UTC (rev 2854) @@ -149,8 +149,8 @@ } /** - * Passing an handle ending with / as the basePath should search the descendants. - * This test makes sure that the resulting xpath query does not end with ///* + * Passing an handle ending with / as the basePath should search the descendants. This test makes sure that the + * resulting xpath query does not end with ///* * @throws Exception */ @Test Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java =================================================================== --- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java 2010-08-19 09:19:37 UTC (rev 2853) +++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java 2010-08-19 09:25:38 UTC (rev 2854) @@ -36,9 +36,8 @@ /** - * Unit test on escaping quotation mark in jcr:contains(). - * Unescaped quotation marks are not illegal: no Exception is thrown on query execution. - * All quotation marks (not only the trailing one) should be escaped to obatain results. + * Unit test on escaping quotation mark in jcr:contains(). Unescaped quotation marks are not illegal: no Exception is + * thrown on query execution. All quotation marks (not only the trailing one) should be escaped to obatain results. * @author dschivo * @version $Id$ */ Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java =================================================================== --- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java 2010-08-19 09:19:37 UTC (rev 2853) +++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java 2010-08-19 09:25:38 UTC (rev 2854) @@ -150,8 +150,12 @@ Calendar end = Calendar.getInstance(); end.set(2001, Calendar.DECEMBER, 31); - Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE).setBasePath( - "/pets").add(Restrictions.between("@birthDate", begin, end)).addOrder(Order.asc("@birthDate")); + Criteria criteria = JCRCriteriaFactory + .createCriteria() + .setWorkspace(ContentRepository.WEBSITE) + .setBasePath("/pets") + .add(Restrictions.between("@birthDate", begin, end)) + .addOrder(Order.asc("@birthDate")); // Query results: // --- 9 (title=Lucky, petType=bird, birthDate=1999-08-06) Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java =================================================================== --- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java 2010-08-19 09:19:37 UTC (rev 2853) +++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java 2010-08-19 09:25:38 UTC (rev 2854) @@ -125,9 +125,14 @@ Calendar end = Calendar.getInstance(); end.set(2001, Calendar.DECEMBER, 31); - Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE).setBasePath( - "/pets").add(Restrictions.contains("@title", "Lucky")).add(Restrictions.eq("@petType", "dog")).add( - Restrictions.betweenDates("@birthDate", begin, end)).addOrder(Order.desc("@title")); + Criteria criteria = JCRCriteriaFactory + .createCriteria() + .setWorkspace(ContentRepository.WEBSITE) + .setBasePath("/pets") + .add(Restrictions.contains("@title", "Lucky")) + .add(Restrictions.eq("@petType", "dog")) + .add(Restrictions.betweenDates("@birthDate", begin, end)) + .addOrder(Order.desc("@title")); return criteria; } @@ -184,10 +189,13 @@ Calendar end = Calendar.getInstance(); end.set(2001, Calendar.DECEMBER, 31); - Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE).setBasePath( - "/pets").add(Restrictions.betweenDates("@birthDate", begin, end)).addOrder(Order.asc("@birthDate")).setPaging( - 5, - 2); + Criteria criteria = JCRCriteriaFactory + .createCriteria() + .setWorkspace(ContentRepository.WEBSITE) + .setBasePath("/pets") + .add(Restrictions.betweenDates("@birthDate", begin, end)) + .addOrder(Order.asc("@birthDate")) + .setPaging(5, 2); AdvancedResult result = criteria.execute(); // first page: Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java =================================================================== --- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java 2010-08-19 09:19:37 UTC (rev 2853) +++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java 2010-08-19 09:25:38 UTC (rev 2854) @@ -152,8 +152,12 @@ Calendar end = Calendar.getInstance(); end.set(2001, Calendar.DECEMBER, 31); - Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE).setBasePath( - "/pets").add(Restrictions.between("@birthDate", begin, end)).addOrder(Order.asc("@birthDate")); + Criteria criteria = JCRCriteriaFactory + .createCriteria() + .setWorkspace(ContentRepository.WEBSITE) + .setBasePath("/pets") + .add(Restrictions.between("@birthDate", begin, end)) + .addOrder(Order.asc("@birthDate")); // Query results: // --- 9 (title=Lucky, petType=bird, birthDate=1999-08-06) @@ -199,8 +203,12 @@ Calendar end = Calendar.getInstance(); end.set(2001, Calendar.DECEMBER, 31); - Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE).setBasePath( - "/pets").add(Restrictions.between("@birthDate", begin, end)).addOrder(Order.asc("@birthDate")); + Criteria criteria = JCRCriteriaFactory + .createCriteria() + .setWorkspace(ContentRepository.WEBSITE) + .setBasePath("/pets") + .add(Restrictions.between("@birthDate", begin, end)) + .addOrder(Order.asc("@birthDate")); AdvancedResult result = criteria.execute(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |