You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2003/10/13 21:31:10 UTC
cvs commit: ws-axis/java/src/org/apache/axis/wsdl/toJava JavaEnumTypeWriter.java
dims 2003/10/13 12:31:10
Modified: java/src/org/apache/axis/wsdl/toJava JavaEnumTypeWriter.java
Log:
Fix for Bug 23619 - enum fromValue() throws IllegalStateException instead of IllegalArgumentException
from ajbanck@informatica.com (AJ Banck)
Revision Changes Path
1.25 +7 -7 ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaEnumTypeWriter.java
Index: JavaEnumTypeWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaEnumTypeWriter.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- JavaEnumTypeWriter.java 13 Aug 2003 19:08:22 -0000 1.24
+++ JavaEnumTypeWriter.java 13 Oct 2003 19:31:09 -0000 1.25
@@ -184,7 +184,7 @@
// FromValue returns the unique enumeration value object from the table
pw.println(" public static " + javaName+ " fromValue(" + baseType +" value)");
- pw.println(" throws java.lang.IllegalStateException {");
+ pw.println(" throws java.lang.IllegalArgumentException {");
pw.println(" "+javaName+" enumeration = ("+javaName+")");
if (baseClass.equals("java.lang.String") ||
baseClass.equals(baseType)) {
@@ -192,37 +192,37 @@
} else {
pw.println(" _table_.get(new " + baseClass + "(value));");
}
- pw.println(" if (enumeration==null) throw new java.lang.IllegalStateException();");
+ pw.println(" if (enumeration==null) throw new java.lang.IllegalArgumentException();");
pw.println(" return enumeration;");
pw.println(" }");
// FromString returns the unique enumeration value object from a string representation
pw.println(" public static " + javaName+ " fromString(java.lang.String value)");
- pw.println(" throws java.lang.IllegalStateException {");
+ pw.println(" throws java.lang.IllegalArgumentException {");
if (baseClass.equals("java.lang.String")) {
pw.println(" return fromValue(value);");
} else if (baseClass.equals(baseType)) {
pw.println(" try {");
pw.println(" return fromValue(new " + baseClass + "(value));");
pw.println(" } catch (Exception e) {");
- pw.println(" throw new java.lang.IllegalStateException();");
+ pw.println(" throw new java.lang.IllegalArgumentException();");
pw.println(" }");
} else if (baseClass.equals("java.lang.Character")) {
pw.println(" if (value != null && value.length() == 1);");
pw.println(" return fromValue(value.charAt(0));");
- pw.println(" throw new java.lang.IllegalStateException();");
+ pw.println(" throw new java.lang.IllegalArgumentException();");
} else if (baseClass.equals("java.lang.Integer")) {
pw.println(" try {");
pw.println(" return fromValue(java.lang.Integer.parseInt(value));");
pw.println(" } catch (Exception e) {");
- pw.println(" throw new java.lang.IllegalStateException();");
+ pw.println(" throw new java.lang.IllegalArgumentException();");
pw.println(" }");
} else {
String parse = "parse" + baseClass.substring(baseClass.lastIndexOf(".")+1);
pw.println(" try {");
pw.println(" return fromValue("+baseClass+"." + parse+"(value));");
pw.println(" } catch (Exception e) {");
- pw.println(" throw new java.lang.IllegalStateException();");
+ pw.println(" throw new java.lang.IllegalArgumentException();");
pw.println(" }");
}