svn commit: r1364060 - in /opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima: normalizer/Normalizer.java normalizer/NumberUtil.java util/CasConsumerUtil.java

[au...@apache.org]

Author: autayeu
Date: Sat Jul 21 10:23:43 2012
New Revision: 1364060

URL: http://svn.apache.org/viewvc?rev=1364060&view=rev
Log:
OPENNLP-526 Exception cleanup in opennlp-uima. Thanks to Daniel Naber for the patch.

Modified:
    opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/normalizer/Normalizer.java
    opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/normalizer/NumberUtil.java
    opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/util/CasConsumerUtil.java

Modified: opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/normalizer/Normalizer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/normalizer/Normalizer.java?rev=1364060&r1=1364059&r2=1364060&view=diff
==============================================================================
--- opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/normalizer/Normalizer.java (original)
+++ opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/normalizer/Normalizer.java Sat Jul 21 10:23:43 2012
@@ -141,7 +141,7 @@ public class Normalizer extends CasAnnot
     } catch (IOException e) {
       throw new ResourceInitializationException(
           ExceptionMessages.MESSAGE_CATALOG, "io_error_model_reading",
-          new Object[] {});
+          new Object[] {e.getMessage()}, e);
     }
   }
 

Modified: opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/normalizer/NumberUtil.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/normalizer/NumberUtil.java?rev=1364060&r1=1364059&r2=1364060&view=diff
==============================================================================
--- opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/normalizer/NumberUtil.java (original)
+++ opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/normalizer/NumberUtil.java Sat Jul 21 10:23:43 2012
@@ -82,7 +82,7 @@ public final class NumberUtil {
       throws ParseException {
 
     if (!isLanguageSupported(languageCode)) {
-      throw new IllegalArgumentException("Language is not supported!");
+      throw new IllegalArgumentException("Language " + languageCode + " is not supported!");
     }
 
     Locale locale = new Locale(languageCode);

Modified: opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/util/CasConsumerUtil.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/util/CasConsumerUtil.java?rev=1364060&r1=1364059&r2=1364060&view=diff
==============================================================================
--- opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/util/CasConsumerUtil.java (original)
+++ opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/util/CasConsumerUtil.java Sat Jul 21 10:23:43 2012
@@ -93,7 +93,7 @@ public final class CasConsumerUtil {
     if (type == null) {
       throw new ResourceInitializationException(
           ResourceInitializationException.INCOMPATIBLE_RANGE_TYPES,
-          new Object[] { "Unable to retrive " + name + " type!" });
+          new Object[] { "Unable to retrieve " + name + " type!" });
     }
     
     return type;
@@ -195,7 +195,7 @@ public final class CasConsumerUtil {
       throw new ResourceInitializationException(
           ResourceInitializationException.STANDARD_MESSAGE_CATALOG,
           new Object[] { "The " + parameterName + " is a " + 
-          "requiered parameter!" });
+          "required parameter!" });
     }
   }
   
@@ -222,7 +222,7 @@ public final class CasConsumerUtil {
       throw new ResourceInitializationException(
           ResourceInitializationException.STANDARD_MESSAGE_CATALOG,
           new Object[] {"The parameter: "  + parameter + " does not have" +
-          "the expected type String"});
+          " the expected type String"});
     }
   }
   
@@ -239,7 +239,7 @@ public final class CasConsumerUtil {
 	    throw new ResourceInitializationException(
 		    ResourceInitializationException.STANDARD_MESSAGE_CATALOG,
 		    new Object[] { "The parameter: " + parameter
-			    + " does not have" + "the expected type String array" });
+			    + " does not have the expected type String array" });
 	}
     }
   
@@ -265,7 +265,7 @@ public final class CasConsumerUtil {
     else {
       throw new ResourceInitializationException(
           ResourceInitializationException.STANDARD_MESSAGE_CATALOG,
-          new Object[] {"The parameter: "  + parameter + " does not have" +
+          new Object[] {"The parameter: "  + parameter + " does not have " +
           "the expected type Integer"});
     }
   }
@@ -314,7 +314,7 @@ public final class CasConsumerUtil {
       throw new ResourceInitializationException(
           ResourceInitializationException.STANDARD_MESSAGE_CATALOG,
           new Object[] {"The parameter: "  + parameter + " does not have" +
-          "the expected type Float"});
+          " the expected type Float"});
     }
   }
   
@@ -341,7 +341,7 @@ public final class CasConsumerUtil {
       throw new ResourceInitializationException(
           ResourceInitializationException.STANDARD_MESSAGE_CATALOG,
           new Object[] {"The parameter: "  + parameter + " does not have" +
-          "the expected type Boolean"});
+          " the expected type Boolean"});
     }
   }