Author: tv
Date: Sun Feb 11 17:23:06 2018
New Revision: 1823858
URL: http://svn.apache.org/viewvc?rev=1823858&view=rev
Log:
Fix some PMD issues
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceFacade.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BooleanField.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DoubleField.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FieldAdapter.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FloatField.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/BooleanValidator.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/CompareCallback.java
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceFacade.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceFacade.java?rev=1823858&r1=1823857&r2=1823858&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceFacade.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceFacade.java
Sun Feb 11 17:23:06 2018
@@ -45,11 +45,11 @@ public class IntakeServiceFacade
/**
* Return whether the intake service has been initialized.
- * @return true if the service has been initialzed
+ * @return true if the service has been initialized
*/
public static boolean isInitialized()
{
- return (!(intakeService == null));
+ return intakeService != null;
}
/**
@@ -91,7 +91,7 @@ public class IntakeServiceFacade
* the name of the group.
* @return the current pool size
* @throws IntakeException
- * A non existant group was passed
+ * A non-existent group was passed
*/
public static int getSize(String groupName) throws IntakeException
{
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BooleanField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BooleanField.java?rev=1823858&r1=1823857&r2=1823858&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BooleanField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BooleanField.java
Sun Feb 11 17:23:06 2018
@@ -133,7 +133,7 @@ public class BooleanField
for (int i = 0; i < inputs.length; i++)
{
values[i] = inputs[i] == null
- ? (getEmptyValue()).booleanValue()
+ ? getEmptyValue().booleanValue()
: inputs[i].booleanValue();
}
@@ -156,7 +156,7 @@ public class BooleanField
boolean result = false;
try
{
- result = (getValue()).booleanValue();
+ result = getValue().booleanValue();
}
catch (Exception e)
{
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DoubleField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DoubleField.java?rev=1823858&r1=1823857&r2=1823858&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DoubleField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DoubleField.java
Sun Feb 11 17:23:06 2018
@@ -135,7 +135,7 @@ public class DoubleField
for (int i = 0; i < inputs.length; i++)
{
values[i] = inputs[i] == null
- ? (getEmptyValue()).doubleValue()
+ ? getEmptyValue().doubleValue()
: inputs[i].doubleValue();
}
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FieldAdapter.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FieldAdapter.java?rev=1823858&r1=1823857&r2=1823858&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FieldAdapter.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FieldAdapter.java
Sun Feb 11 17:23:06 2018
@@ -193,7 +193,7 @@ public class FieldAdapter extends XmlAda
protected interface FieldCtor
{
- public Field<?> getInstance(XmlField f, Group g) throws
IntakeException;
+ Field<?> getInstance(XmlField f, Group g) throws IntakeException;
}
/**
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FloatField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FloatField.java?rev=1823858&r1=1823857&r2=1823858&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FloatField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FloatField.java
Sun Feb 11 17:23:06 2018
@@ -135,7 +135,7 @@ public class FloatField
for (int i = 0; i < inputs.length; i++)
{
values[i] = inputs[i] == null
- ? (getEmptyValue()).floatValue()
+ ? getEmptyValue().floatValue()
: inputs[i].floatValue();
}
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java?rev=1823858&r1=1823857&r2=1823858&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java
Sun Feb 11 17:23:06 2018
@@ -134,7 +134,7 @@ public class IntegerField
for (int i = 0; i < inputs.length; i++)
{
values[i] = inputs[i] == null
- ? (getEmptyValue()).intValue()
+ ? getEmptyValue().intValue()
: inputs[i].intValue();
}
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java?rev=1823858&r1=1823857&r2=1823858&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java
Sun Feb 11 17:23:06 2018
@@ -133,7 +133,7 @@ public class LongField
for (int i = 0; i < inputs.length; i++)
{
values[i] = inputs[i] == null
- ? (getEmptyValue()).longValue()
+ ? getEmptyValue().longValue()
: inputs[i].longValue();
}
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java?rev=1823858&r1=1823857&r2=1823858&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java
Sun Feb 11 17:23:06 2018
@@ -134,7 +134,7 @@ public class ShortField
for (int i = 0; i < inputs.length; i++)
{
values[i] = inputs[i] == null
- ? (getEmptyValue()).shortValue()
+ ? getEmptyValue().shortValue()
: inputs[i].shortValue();
}
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/BooleanValidator.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/BooleanValidator.java?rev=1823858&r1=1823857&r2=1823858&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/BooleanValidator.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/BooleanValidator.java
Sun Feb 11 17:23:06 2018
@@ -114,14 +114,14 @@ public class BooleanValidator
cnt < Math.max(trueValues.length, falseValues.length); cnt++)
{
// Short-cut evaluation or bust!
- if ((cnt < trueValues.length) &&
+ if (cnt < trueValues.length &&
stringValue.equalsIgnoreCase(trueValues[cnt]))
{
result = Boolean.TRUE;
break;
}
- if ((cnt < falseValues.length) &&
+ if (cnt < falseValues.length &&
stringValue.equalsIgnoreCase(falseValues[cnt]))
{
result = Boolean.FALSE;
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/CompareCallback.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/CompareCallback.java?rev=1823858&r1=1823857&r2=1823858&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/CompareCallback.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/CompareCallback.java
Sun Feb 11 17:23:06 2018
@@ -38,5 +38,5 @@ public interface CompareCallback<T>
*
* @return the result of the comparison
*/
- public boolean compareValues(Comparison compare, T thisValue, T refValue);
+ boolean compareValues(Comparison compare, T thisValue, T refValue);
}
