You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by fr...@apache.org on 2007/05/04 20:49:56 UTC
svn commit: r535349 - in /incubator/tuscany/java/sdo/impl/src:
main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java
Author: frankb
Date: Fri May 4 11:49:46 2007
New Revision: 535349
URL: http://svn.apache.org/viewvc?view=rev&rev=535349
Log:
Fix for TUSCANY-993
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java?view=diff&rev=535349&r1=535348&r2=535349
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java Fri May 4 11:49:46 2007
@@ -110,41 +110,40 @@
public static final int TYPE = 7;
public static final int TYPES = 8;
public static final int XSD_TYPE = 9;
- public static final int BASE64_BYTES = 10;
- public static final int BOOLEAN = 11;
- public static final int BOOLEAN_OBJECT = 12;
- public static final int BYTE = 13;
- public static final int BYTE_OBJECT = 14;
- public static final int BYTES = 15;
- public static final int CHANGE_SUMMARY_TYPE = 16;
- public static final int CHARACTER = 17;
- public static final int CHARACTER_OBJECT = 18;
- public static final int DATE = 19;
- public static final int DATE_TIME = 20;
- public static final int DAY = 21;
- public static final int DECIMAL = 22;
- public static final int DOUBLE = 23;
- public static final int DOUBLE_OBJECT = 24;
- public static final int DURATION = 25;
- public static final int FLOAT = 26;
- public static final int FLOAT_OBJECT = 27;
- public static final int INT = 28;
- public static final int INTEGER = 29;
- public static final int INT_OBJECT = 30;
- public static final int LONG = 31;
- public static final int LONG_OBJECT = 32;
- public static final int MONTH = 33;
- public static final int MONTH_DAY = 34;
- public static final int OBJECT = 35;
- public static final int SHORT = 36;
- public static final int SHORT_OBJECT = 37;
- public static final int STRING = 38;
- public static final int STRINGS = 39;
- public static final int TIME = 40;
- public static final int URI = 41;
- public static final int YEAR = 42;
- public static final int YEAR_MONTH = 43;
- public static final int YEAR_MONTH_DAY = 44;
+ public static final int BOOLEAN = 10;
+ public static final int BOOLEAN_OBJECT = 11;
+ public static final int BYTE = 12;
+ public static final int BYTE_OBJECT = 13;
+ public static final int BYTES = 14;
+ public static final int CHANGE_SUMMARY_TYPE = 15;
+ public static final int CHARACTER = 16;
+ public static final int CHARACTER_OBJECT = 17;
+ public static final int DATE = 18;
+ public static final int DATE_TIME = 19;
+ public static final int DAY = 20;
+ public static final int DECIMAL = 21;
+ public static final int DOUBLE = 22;
+ public static final int DOUBLE_OBJECT = 23;
+ public static final int DURATION = 24;
+ public static final int FLOAT = 25;
+ public static final int FLOAT_OBJECT = 26;
+ public static final int INT = 27;
+ public static final int INTEGER = 28;
+ public static final int INT_OBJECT = 29;
+ public static final int LONG = 30;
+ public static final int LONG_OBJECT = 31;
+ public static final int MONTH = 32;
+ public static final int MONTH_DAY = 33;
+ public static final int OBJECT = 34;
+ public static final int SHORT = 35;
+ public static final int SHORT_OBJECT = 36;
+ public static final int STRING = 37;
+ public static final int STRINGS = 38;
+ public static final int TIME = 39;
+ public static final int URI = 40;
+ public static final int YEAR = 41;
+ public static final int YEAR_MONTH = 42;
+ public static final int YEAR_MONTH_DAY = 43;
/**
* Creates an instance of the factory.
@@ -202,8 +201,6 @@
{
switch (typeNumber)
{
- case BASE64_BYTES:
- return createBase64BytesFromString(initialValue);
case BOOLEAN:
return createBooleanFromString(initialValue);
case BOOLEAN_OBJECT:
@@ -286,8 +283,6 @@
{
switch (typeNumber)
{
- case BASE64_BYTES:
- return convertBase64BytesToString(instanceValue);
case BOOLEAN:
return convertBooleanToString(instanceValue);
case BOOLEAN_OBJECT:
@@ -485,13 +480,6 @@
return xsdTypeType;
}
- protected commonj.sdo.Type base64BytesType = null;
-
- public commonj.sdo.Type getBase64Bytes()
- {
- return base64BytesType;
- }
-
protected commonj.sdo.Type boolean_Type = null;
public commonj.sdo.Type getBoolean()
@@ -805,7 +793,6 @@
createProperty(true, xsdTypeType,XSDTypeImpl.INTERNAL_ANY);
// Create data types
- base64BytesType = createType(true, BASE64_BYTES );
boolean_Type = createType(true, BOOLEAN );
booleanObjectType = createType(true, BOOLEAN_OBJECT );
byte_Type = createType(true, BYTE );
@@ -961,9 +948,6 @@
initializeProperty(property, getSequence(), "any", null, 0, -1, XSDType.class, false, false, false);
// Initialize data types
- initializeType(base64BytesType, byte[].class, "Base64Bytes", true, false);
- setInstanceProperty (base64BytesType, "commonj.sdo/java", "instanceClass", "byte[]");
-
initializeType(boolean_Type, boolean.class, "Boolean", true, false);
setInstanceProperty (boolean_Type, "commonj.sdo/java", "instanceClass", "boolean");
@@ -1473,13 +1457,6 @@
});
addXSDMapping
- (base64BytesType,
- new String[]
- {
- "name", "Base64Bytes"
- });
-
- addXSDMapping
(boolean_Type,
new String[]
{
@@ -1727,33 +1704,6 @@
}
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public byte[] createBase64BytesFromString(String initialValue)
- {
- return XMLTypeFactory.eINSTANCE.createBase64Binary(initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String convertBase64BytesToString(Object instanceValue)
- {
- if (instanceValue instanceof byte[])
- {
- return XMLTypeFactory.eINSTANCE.convertBase64Binary((byte[])instanceValue);
- }
- else
- {
- return XMLTypeFactory.eINSTANCE.convertBase64Binary(instanceValue.toString().getBytes());
- }
- }
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
Modified: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java?view=diff&rev=535349&r1=535348&r2=535349
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java (original)
+++ incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java Fri May 4 11:49:46 2007
@@ -95,7 +95,6 @@
list.add("bar");
list.add("test");
Test[] tests = {
- new Test(types.getType(URI, "Base64Bytes"), "SGVsbG8gV29ybGQ=", "Hello World", new BytesComparator()),
new Test(types.getType(URI, "Boolean"), "true", new Boolean(true)),
new Test(types.getType(URI, "Byte"), "49", new Byte((byte)49)),
new Test(types.getType(URI, "Bytes"), "666F6F", "foo", new BytesComparator()),
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org