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/03/22 17:31:45 UTC
svn commit: r521326 - in /incubator/tuscany/java/sdo:
impl/src/main/java/org/apache/tuscany/sdo/model/impl/
tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/
tools/templates/models/
Author: frankb
Date: Thu Mar 22 09:31:38 2007
New Revision: 521326
URL: http://svn.apache.org/viewvc?view=rev&rev=521326
Log:
Remove _ property name mangling from ModelFactoryImpl and fix generator problem with extended property numbers in subclasses
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
incubator/tuscany/java/sdo/tools/templates/models/SDOClass.javajet
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java?view=diff&rev=521326&r1=521325&r2=521326
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java Thu Mar 22 09:31:38 2007
@@ -41,7 +41,7 @@
public class DataGraphTypeImpl extends BaseDataGraphTypeImpl implements DataGraphType
{
- public final static int ANY = BaseDataGraphTypeImpl.SDO_PROPERTY_COUNT + -1;
+ public final static int ANY = BaseDataGraphTypeImpl.EXTENDED_PROPERTY_COUNT + -1;
public final static int SDO_PROPERTY_COUNT = BaseDataGraphTypeImpl.SDO_PROPERTY_COUNT + 0;
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=521326&r1=521325&r2=521326
==============================================================================
--- 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 Thu Mar 22 09:31:38 2007
@@ -893,7 +893,7 @@
initializeProperty(property, this.getBoolean(), "containment", null, 0, 1, Property.class, false, true, false);
property = getProperty(propertyType, PropertyImpl.INTERNAL_DEFAULT);
- initializeProperty(property, this.getString(), "default_", null, 0, 1, Property.class, false, true, false);
+ initializeProperty(property, this.getString(), "default", null, 0, 1, Property.class, false, true, false);
property = getProperty(propertyType, PropertyImpl.INTERNAL_READ_ONLY);
initializeProperty(property, this.getBoolean(), "readOnly", null, 0, 1, Property.class, false, true, false);
@@ -947,7 +947,7 @@
initializeProperty(property, this.getBoolean(), "sequenced", null, 0, 1, Type.class, false, true, false);
property = getProperty(typeType, TypeImpl.INTERNAL_ABSTRACT);
- initializeProperty(property, this.getBoolean(), "abstract_", null, 0, 1, Type.class, false, true, false);
+ initializeProperty(property, this.getBoolean(), "abstract", null, 0, 1, Type.class, false, true, false);
property = getProperty(typeType, TypeImpl.INTERNAL_ANY_ATTRIBUTE);
initializeProperty(property, getSequence(), "anyAttribute", null, 0, -1, Type.class, false, false, false);
Modified: incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java?view=diff&rev=521326&r1=521325&r2=521326
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java (original)
+++ incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java Thu Mar 22 09:31:38 2007
@@ -1505,7 +1505,7 @@
{
featureValue = base.getClassName() + "." + genFeature.getUpperName();
} else {
- String baseCountID = base.getClassName() + "." + "SDO_PROPERTY_COUNT";
+ String baseCountID = base.getClassName() + "." + "EXTENDED_PROPERTY_COUNT";
featureValue = baseCountID + " + " + Integer.toString(-1 - extendedProperties.indexOf(genFeature.getEcoreFeature()));
}
}
Modified: incubator/tuscany/java/sdo/tools/templates/models/SDOClass.javajet
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/templates/models/SDOClass.javajet?view=diff&rev=521326&r1=521325&r2=521326
==============================================================================
--- incubator/tuscany/java/sdo/tools/templates/models/SDOClass.javajet (original)
+++ incubator/tuscany/java/sdo/tools/templates/models/SDOClass.javajet Thu Mar 22 09:31:38 2007
@@ -212,7 +212,7 @@
{
featureValue = base.getClassName() + "." + genFeature.getUpperName();
} else {
- String baseCountID = base.getClassName() + "." + "SDO_PROPERTY_COUNT";
+ String baseCountID = base.getClassName() + "." + "EXTENDED_PROPERTY_COUNT";
featureValue = baseCountID + " + " + Integer.toString(-1 - extendedProperties.indexOf(genFeature.getEcoreFeature()));
}
}%>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org