You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by er...@apache.org on 2004/03/15 18:51:06 UTC
cvs commit: xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/values JavaStringEnumerationHolderEx.java
ericvas 2004/03/15 09:51:05
Modified: v2/external/lib oldxbean.jar
v2/src/typeimpl/org/apache/xmlbeans/impl/values
JavaStringEnumerationHolderEx.java
Log:
Fix 1.5 enum warnings and bootstraped
Revision Changes Path
1.7 +3712 -3785xml-xmlbeans/v2/external/lib/oldxbean.jar
<<Binary file>>
1.3 +7 -7 xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/values/JavaStringEnumerationHolderEx.java
Index: JavaStringEnumerationHolderEx.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/values/JavaStringEnumerationHolderEx.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavaStringEnumerationHolderEx.java 12 Feb 2004 20:06:22 -0000 1.2
+++ JavaStringEnumerationHolderEx.java 15 Mar 2004 17:51:05 -0000 1.3
@@ -33,12 +33,12 @@
// update the intval when setting via text, nil.
protected void set_text(String s)
{
- StringEnumAbstractBase enum = schemaType().enumForString(s);
- if (enum == null)
+ StringEnumAbstractBase se = schemaType().enumForString(s);
+ if (se == null)
throw new XmlValueOutOfRangeException("String '" + s + "' is not a valid enumerated value for " + schemaType());
super.set_text(s);
- _val = enum;
+ _val = se;
}
public static void validateLexical(String v, SchemaType sType, ValidationContext context)
@@ -70,13 +70,13 @@
return _val;
}
- protected void set_enum(StringEnumAbstractBase enum)
+ protected void set_enum(StringEnumAbstractBase se)
{
Class ejc = schemaType().getEnumJavaClass();
- if (ejc != null && !enum.getClass().equals(ejc))
+ if (ejc != null && !se.getClass().equals(ejc))
throw new XmlValueOutOfRangeException();
- super.set_text(enum.toString());
- _val = enum;
+ super.set_text(se.toString());
+ _val = se;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org