You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2009/11/02 19:55:09 UTC
svn commit: r832048 - in
/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake:
IntakeServiceFacade.java IntakeServiceImpl.java model/Group.java
validator/FieldReference.java validator/StringValidator.java
Author: tv
Date: Mon Nov 2 18:55:08 2009
New Revision: 832048
URL: http://svn.apache.org/viewvc?rev=832048&view=rev
Log:
- Fix some PMD and Javadoc complaints
- Catch only exceptions that are actually thrown
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceFacade.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FieldReference.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/StringValidator.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=832048&r1=832047&r2=832048&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 Mon Nov 2 18:55:08 2009
@@ -46,7 +46,7 @@
/**
* Return whether the intake service has been initialized.
- * @return
+ * @return true if the service has been initialzed
*/
public static boolean isInitialized()
{
Modified: turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java?rev=832048&r1=832047&r2=832048&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java (original)
+++ turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java Mon Nov 2 18:55:08 2009
@@ -503,17 +503,10 @@
if (gettersForClassName != null)
{
- try
+ Method getter = pd.getReadMethod();
+ if (getter != null)
{
- Method getter = pd.getReadMethod();
- if (getter != null)
- {
- gettersForClassName.put(propName, getter);
- }
- }
- catch (Exception e)
- {
- // Do nothing
+ gettersForClassName.put(propName, getter);
}
}
}
@@ -568,17 +561,10 @@
if (settersForClassName != null)
{
- try
- {
- Method setter = pd.getWriteMethod();
- if (setter != null)
- {
- settersForClassName.put(propName, setter);
- }
- }
- catch (Exception e)
+ Method setter = pd.getWriteMethod();
+ if (setter != null)
{
- // Do nothing
+ settersForClassName.put(propName, setter);
}
}
}
Modified: turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java?rev=832048&r1=832047&r2=832048&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java (original)
+++ turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java Mon Nov 2 18:55:08 2009
@@ -426,7 +426,7 @@
{
flds[i].setProperty(obj);
}
- catch (Exception e)
+ catch (IntakeException e)
{
// just move on to next field
}
@@ -447,7 +447,7 @@
{
interfaceFields[i].setProperty(obj);
}
- catch(Exception e)
+ catch(IntakeException e)
{
// just move on to next field
}
Modified: turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FieldReference.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FieldReference.java?rev=832048&r1=832047&r2=832048&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FieldReference.java (original)
+++ turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/FieldReference.java Mon Nov 2 18:55:08 2009
@@ -158,8 +158,8 @@
/**
* Map the comparison strings to their numeric counterparts
*
- * @param key the
- * @return
+ * @param key the string representation of a comparison operator
+ * @return the numeric representation of the given comparison operator
*/
public static int getCompareType(String key)
{
Modified: turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/StringValidator.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/StringValidator.java?rev=832048&r1=832047&r2=832048&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/StringValidator.java (original)
+++ turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/validator/StringValidator.java Mon Nov 2 18:55:08 2009
@@ -77,6 +77,7 @@
*/
public StringValidator()
{
+ // do nothing
}
/**
@@ -115,21 +116,18 @@
{
super.assertValidity(testValue);
- if (required || StringUtils.isNotEmpty(testValue))
+ if ((required || StringUtils.isNotEmpty(testValue)) && maskPattern != null)
{
- if (maskPattern != null)
- {
- /** JDK 1.4 matcher */
- boolean patternMatch = maskPattern.matcher(testValue).matches();
+ /** JDK 1.4 matcher */
+ boolean patternMatch = maskPattern.matcher(testValue).matches();
- log.debug("Trying to match " + testValue
- + " to pattern " + maskString);
+ log.debug("Trying to match " + testValue
+ + " to pattern " + maskString);
- if (!patternMatch)
- {
- errorMessage = maskMessage;
- throw new ValidationException(maskMessage);
- }
+ if (!patternMatch)
+ {
+ errorMessage = maskMessage;
+ throw new ValidationException(maskMessage);
}
}
}