You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ke...@apache.org on 2007/07/25 15:58:15 UTC
svn commit: r559459 - in /incubator/tuscany/java/sdo/tools:
src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
templates/models/SDOClass.javajet
Author: kelvingoodson
Date: Wed Jul 25 06:58:14 2007
New Revision: 559459
URL: http://svn.apache.org/viewvc?view=rev&rev=559459
Log:
Fix for TUSCANY-1470
Modified:
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/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=559459&r1=559458&r2=559459
==============================================================================
--- 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 Wed Jul 25 06:58:14 2007
@@ -1479,9 +1479,9 @@
int baseCount = base.getFeatureCount();
if (g < baseCount)
{
- featureValue = base.getClassName() + "." + genFeature.getUpperName();
+ featureValue = base.getImportedClassName() + "." + genFeature.getUpperName();
} else {
- String baseCountID = base.getClassName() + "." + "SDO_PROPERTY_COUNT";
+ String baseCountID = base.getImportedClassName() + "." + "SDO_PROPERTY_COUNT";
featureValue = baseCountID + " + " + Integer.toString(declaredProperties.indexOf(genFeature.getEcoreFeature()));
}
}
@@ -1503,9 +1503,9 @@
int baseCount = base.getFeatureCount();
if (g < baseCount)
{
- featureValue = base.getClassName() + "." + genFeature.getUpperName();
+ featureValue = base.getImportedClassName() + "." + genFeature.getUpperName();
} else {
- String baseCountID = base.getClassName() + "." + "EXTENDED_PROPERTY_COUNT";
+ String baseCountID = base.getImportedClassName() + "." + "EXTENDED_PROPERTY_COUNT";
featureValue = baseCountID + " + " + Integer.toString(-1 - extendedProperties.indexOf(genFeature.getEcoreFeature()));
}
}
@@ -1523,7 +1523,7 @@
featureCount = Integer.toString(declaredPropertiesCount);
}
else {
- String baseCountID = base.getClassName() + "." + "SDO_PROPERTY_COUNT";
+ String baseCountID = base.getImportedClassName() + "." + "SDO_PROPERTY_COUNT";
featureCount = baseCountID + " + " + Integer.toString(declaredPropertiesCount);
}
stringBuffer.append(TEXT_68);
@@ -1536,7 +1536,7 @@
featureCount = Integer.toString(extendedPropertiesCount*-1);
}
else {
- String baseCountID = base.getClassName() + "." + "EXTENDED_PROPERTY_COUNT";
+ String baseCountID = base.getImportedClassName() + "." + "EXTENDED_PROPERTY_COUNT";
featureCount = baseCountID + " - " + Integer.toString(extendedPropertiesCount);
}
stringBuffer.append(TEXT_70);
@@ -1559,9 +1559,9 @@
int baseCount = base.getFeatureCount();
if (g < baseCount)
{
- featureValue = base.getClassName() + ".INTERNAL_" + genFeature.getUpperName();
+ featureValue = base.getImportedClassName() + ".INTERNAL_" + genFeature.getUpperName();
} else {
- String baseCountID = base.getClassName() + "." + "INTERNAL_PROPERTY_COUNT";
+ String baseCountID = base.getImportedClassName() + "." + "INTERNAL_PROPERTY_COUNT";
featureValue = baseCountID + " + " + Integer.toString(g - baseCount);
}
}
@@ -1579,7 +1579,7 @@
featureCount = Integer.toString(genClass.getFeatureCount());
}
else {
- String baseCountID = base.getClassName() + "." + "INTERNAL_PROPERTY_COUNT";
+ String baseCountID = base.getImportedClassName() + "." + "INTERNAL_PROPERTY_COUNT";
featureCount = baseCountID + " + " + Integer.toString(genClass.getFeatureCount() - base.getFeatureCount());
}
stringBuffer.append(TEXT_79);
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=559459&r1=559458&r2=559459
==============================================================================
--- incubator/tuscany/java/sdo/tools/templates/models/SDOClass.javajet (original)
+++ incubator/tuscany/java/sdo/tools/templates/models/SDOClass.javajet Wed Jul 25 06:58:14 2007
@@ -189,9 +189,9 @@
int baseCount = base.getFeatureCount();
if (g < baseCount)
{
- featureValue = base.getClassName() + "." + genFeature.getUpperName();
+ featureValue = base.getImportedClassName() + "." + genFeature.getUpperName();
} else {
- String baseCountID = base.getClassName() + "." + "SDO_PROPERTY_COUNT";
+ String baseCountID = base.getImportedClassName() + "." + "SDO_PROPERTY_COUNT";
featureValue = baseCountID + " + " + Integer.toString(declaredProperties.indexOf(genFeature.getEcoreFeature()));
}
}%>
@@ -210,9 +210,9 @@
int baseCount = base.getFeatureCount();
if (g < baseCount)
{
- featureValue = base.getClassName() + "." + genFeature.getUpperName();
+ featureValue = base.getImportedClassName() + "." + genFeature.getUpperName();
} else {
- String baseCountID = base.getClassName() + "." + "EXTENDED_PROPERTY_COUNT";
+ String baseCountID = base.getImportedClassName() + "." + "EXTENDED_PROPERTY_COUNT";
featureValue = baseCountID + " + " + Integer.toString(-1 - extendedProperties.indexOf(genFeature.getEcoreFeature()));
}
}%>
@@ -227,7 +227,7 @@
<%featureCount = Integer.toString(declaredPropertiesCount);%>
<%}%>
<%else {%>
- <%String baseCountID = base.getClassName() + "." + "SDO_PROPERTY_COUNT";%>
+ <%String baseCountID = base.getImportedClassName() + "." + "SDO_PROPERTY_COUNT";%>
<%featureCount = baseCountID + " + " + Integer.toString(declaredPropertiesCount);%>
<%}%>
public final static int SDO_PROPERTY_COUNT = <%=featureCount%>;
@@ -239,7 +239,7 @@
<%featureCount = Integer.toString(extendedPropertiesCount*-1);%>
<%}%>
<%else {%>
- <%String baseCountID = base.getClassName() + "." + "EXTENDED_PROPERTY_COUNT";%>
+ <%String baseCountID = base.getImportedClassName() + "." + "EXTENDED_PROPERTY_COUNT";%>
<%featureCount = baseCountID + " - " + Integer.toString(extendedPropertiesCount);%>
<%}%>
public final static int EXTENDED_PROPERTY_COUNT = <%=featureCount%>;
@@ -264,9 +264,9 @@
<%int baseCount = base.getFeatureCount();%>
<%if (g < baseCount)%>
<%{%>
- <%featureValue = base.getClassName() + ".INTERNAL_" + genFeature.getUpperName();%>
+ <%featureValue = base.getImportedClassName() + ".INTERNAL_" + genFeature.getUpperName();%>
<%} else {%>
- <%String baseCountID = base.getClassName() + "." + "INTERNAL_PROPERTY_COUNT";%>
+ <%String baseCountID = base.getImportedClassName() + "." + "INTERNAL_PROPERTY_COUNT";%>
<%featureValue = baseCountID + " + " + Integer.toString(g - baseCount);%>
<%}%>
<%}%>
@@ -287,7 +287,7 @@
featureCount = Integer.toString(genClass.getFeatureCount());
}
else {
- String baseCountID = base.getClassName() + "." + "INTERNAL_PROPERTY_COUNT";
+ String baseCountID = base.getImportedClassName() + "." + "INTERNAL_PROPERTY_COUNT";
featureCount = baseCountID + " + " + Integer.toString(genClass.getFeatureCount() - base.getFeatureCount());
}%>
public final static int INTERNAL_PROPERTY_COUNT = <%=featureCount%>;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org