Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[1259] trunk/openutils-mgnlcriteria/src/main/java/net /sourceforge/openutils/mgnlcriteria/jcr/query
|
From: <fg...@us...> - 2009-08-13 08:10:25
|
Revision: 1259
http://openutils.svn.sourceforge.net/openutils/?rev=1259&view=rev
Author: fgrilli
Date: 2009-08-13 08:10:16 +0000 (Thu, 13 Aug 2009)
Log Message:
-----------
some fixes and improvements suggested by findbugs
Modified Paths:
--------------
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/InExpression.java
trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.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/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/criterion/InExpression.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/InExpression.java 2009-08-12 16:37:45 UTC (rev 1258)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/InExpression.java 2009-08-13 08:10:16 UTC (rev 1259)
@@ -38,12 +38,6 @@
public InExpression(String nodeName, String[] values)
{
this.nodeName = nodeName;
- if (!(values instanceof String[]))
- {
- String msg = "values must be of type String[]";
- log.error(msg);
- throw new IllegalArgumentException(msg);
- }
this.values = values;
}
Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.java 2009-08-12 16:37:45 UTC (rev 1258)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/MatchMode.java 2009-08-13 08:10:16 UTC (rev 1259)
@@ -94,11 +94,6 @@
INSTANCES.put(ANYWHERE.name, ANYWHERE);
}
- private Object readResolve()
- {
- return INSTANCES.get(name);
- }
-
/**
* convert the pattern, by appending/prepending "%"
*/
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 2009-08-12 16:37:45 UTC (rev 1258)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/AbstractCriteriaImpl.java 2009-08-13 08:10:16 UTC (rev 1259)
@@ -104,7 +104,7 @@
public Criteria setMaxResults(int maxResults)
{
- this.maxResults = new Integer(maxResults);
+ this.maxResults = Integer.valueOf(maxResults);
return this;
}
@@ -115,7 +115,7 @@
public Criteria setFirstResult(int firstResult)
{
- this.firstResult = new Integer(firstResult);
+ this.firstResult = Integer.valueOf(firstResult);
return this;
}
@@ -126,7 +126,7 @@
public Criteria setTimeout(int timeout)
{
- this.timeout = new Integer(timeout);
+ this.timeout = Integer.valueOf(timeout);
return this;
}
@@ -146,6 +146,8 @@
public static final class CriterionEntry implements Serializable
{
+ private static final long serialVersionUID = 1L;
+
private final Criterion criterion;
private final Criteria criteria;
@@ -175,6 +177,7 @@
public static final class OrderEntry implements Serializable
{
+ private static final long serialVersionUID = 1L;
private final Order order;
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-08-12 16:37:45 UTC (rev 1258)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaImpl.java 2009-08-13 08:10:16 UTC (rev 1259)
@@ -110,9 +110,8 @@
else
{
log.debug("returning a Collection holding objects of type {} ", classType.getName());
- Iterator iter = retVal.iterator();
List list = new ArrayList();
- while (iter.hasNext())
+ for (Iterator iter = retVal.iterator(); iter.hasNext();)
{
Content node = (Content) iter.next();
try
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-08-12 16:37:45 UTC (rev 1258)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java 2009-08-13 08:10:16 UTC (rev 1259)
@@ -127,7 +127,7 @@
stop = System.currentTimeMillis();
log.debug("Query executed in {} milliseconds", stop - start);
- Collection retVal = new ArrayList();
+ Collection retVal;
field = managerClass.getDeclaredField(HIERARCHY_MANAGER);
field.setAccessible(true);
HierarchyManager hm = (HierarchyManager) field.get(queryManager);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
