Author: kelvingoodson
Date: Wed Jul 25 09:08:04 2007
New Revision: 559505
URL: http://svn.apache.org/viewvc?view=rev&rev=559505
Log:
fix for TUSCANY-1470 applied to branch
Modified:
incubator/tuscany/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
incubator/tuscany/branches/sdo-1.0-incubating/tools/templates/models/SDOClass.javajet
Modified:
incubator/tuscany/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java?view=diff&rev=559505&r1=559504&r2=559505
==============================================================================
---
incubator/tuscany/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
(original)
+++
incubator/tuscany/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
Wed Jul 25 09:08:04 2007
@@ -17,7 +17,7 @@
return result;
}
- public final String NL = nl == null ?
(System.getProperties().getProperty("line.separator")) : nl;
+ protected final String NL = nl == null ?
(System.getProperties().getProperty("line.separator")) : nl;
protected final String TEXT_1 = "";
protected final String TEXT_2 = "/**" + NL + " * <copyright>" + NL + " *
</copyright>" + NL + " *" + NL + " * ";
protected final String TEXT_3 = "Id";
@@ -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/branches/sdo-1.0-incubating/tools/templates/models/SDOClass.javajet
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/tools/templates/models/SDOClass.javajet?view=diff&rev=559505&r1=559504&r2=559505
==============================================================================
---
incubator/tuscany/branches/sdo-1.0-incubating/tools/templates/models/SDOClass.javajet
(original)
+++
incubator/tuscany/branches/sdo-1.0-incubating/tools/templates/models/SDOClass.javajet
Wed Jul 25 09:08:04 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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
