Author: tn
Date: Thu Aug 30 20:36:17 2012
New Revision: 1379128
URL: http://svn.apache.org/viewvc?rev=1379128&view=rev
Log:
Resolved FIXME comments: throw IAE when failed to parse resource files.
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Lang.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Lang.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Lang.java?rev=1379128&r1=1379127&r2=1379128&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Lang.java
(original)
+++
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Lang.java
Thu Aug 30 20:36:17 2012
@@ -167,9 +167,8 @@ public class Lang {
String[] parts = line.split("\\s+");
if (parts.length != 3) {
- // FIXME: consider throwing an IllegalStateException
like in Rule
- // System.err.println("Warning: malformed line '" +
rawLine + "'");
- continue;
+ throw new IllegalArgumentException("Malformed line '"
+ rawLine + "' in language resource '" +
+
languageRulesResourceName + "'");
}
Pattern pattern = Pattern.compile(parts[0]);
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java?rev=1379128&r1=1379127&r2=1379128&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java
(original)
+++
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java
Thu Aug 30 20:36:17 2012
@@ -358,8 +358,8 @@ public class Rule {
// include statement
String incl =
line.substring(HASH_INCLUDE.length()).trim();
if (incl.contains(" ")) {
- // FIXME: consider throwing an
IllegalStateException like in parsePhonemeExpr
- // System.err.println("Warning: malformed import
statement: " + rawLine);
+ throw new IllegalArgumentException("Malformed
import statement '" + rawLine + "' in " +
+ location);
} else {
lines.addAll(parseRules(createScanner(incl),
location + "->" + incl));
}
@@ -367,9 +367,8 @@ public class Rule {
// rule
String[] parts = line.split("\\s+");
if (parts.length != 4) {
- // FIXME: consider throwing an
IllegalStateException like in parsePhonemeExpr
-// System.err.println("Warning: malformed rule
statement split into " + parts.length +
-// " parts: " + rawLine);
+ throw new IllegalArgumentException("Malformed rule
statement split into " + parts.length +
+ " parts: " +
rawLine + " in " + location);
} else {
try {
String pat = stripQuotes(parts[0]);
@@ -393,7 +392,8 @@ public class Rule {
};
lines.add(r);
} catch (IllegalArgumentException e) {
- throw new IllegalStateException("Problem
parsing line " + currentLine, e);
+ throw new IllegalStateException("Problem
parsing line '" + currentLine + "' in " +
+ location, e);
}
}
}
