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/21 23:02:14 UTC
svn commit: r521017 - in /incubator/tuscany/java/sdo/tools:
src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
templates/models/SDOClass.javajet
Author: frankb
Date: Wed Mar 21 15:02:13 2007
New Revision: 521017
URL: http://svn.apache.org/viewvc?view=rev&rev=521017
Log:
Fix for TUSCANY-1190
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=521017&r1=521016&r2=521017
==============================================================================
--- 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 Mar 21 15:02:13 2007
@@ -388,17 +388,17 @@
protected final String TEXT_368 = ";";
protected final String TEXT_369 = NL + "\t\treturn create";
protected final String TEXT_370 = "(get";
- protected final String TEXT_371 = "(), getType(), ";
+ protected final String TEXT_371 = "(), getType(), INTERNAL_";
protected final String TEXT_372 = ");";
protected final String TEXT_373 = NL + "\t\treturn (";
protected final String TEXT_374 = ")((";
protected final String TEXT_375 = ")get";
protected final String TEXT_376 = "()).list(";
protected final String TEXT_377 = ");";
- protected final String TEXT_378 = NL + " return get";
+ protected final String TEXT_378 = NL + "\t\treturn get";
protected final String TEXT_379 = "(get";
- protected final String TEXT_380 = "(), getType(), ";
- protected final String TEXT_381 = ");" + NL;
+ protected final String TEXT_380 = "(), getType(), INTERNAL_";
+ protected final String TEXT_381 = ");";
protected final String TEXT_382 = NL + "\t\treturn ((";
protected final String TEXT_383 = ")get";
protected final String TEXT_384 = "()).list(";
@@ -417,7 +417,7 @@
protected final String TEXT_397 = "(";
protected final String TEXT_398 = ")get(get";
protected final String TEXT_399 = "(), getType(), INTERNAL_";
- protected final String TEXT_400 = ");";
+ protected final String TEXT_400 = ")";
protected final String TEXT_401 = ").";
protected final String TEXT_402 = "()";
protected final String TEXT_403 = ";";
@@ -438,7 +438,7 @@
protected final String TEXT_418 = ";";
protected final String TEXT_419 = NL + "\t\treturn (";
protected final String TEXT_420 = ")get(get";
- protected final String TEXT_421 = "(), getType(), ";
+ protected final String TEXT_421 = "(), getType(), INTERNAL_";
protected final String TEXT_422 = ");";
protected final String TEXT_423 = NL + "\t\treturn (";
protected final String TEXT_424 = ")get";
@@ -495,11 +495,11 @@
protected final String TEXT_475 = NL + "\t\t}";
protected final String TEXT_476 = NL + "\t\treturn changeContext;";
protected final String TEXT_477 = NL + "\t\treturn basicAdd(get";
- protected final String TEXT_478 = "(), getType(), ";
+ protected final String TEXT_478 = "(), getType(), INTERNAL_";
protected final String TEXT_479 = ", new";
protected final String TEXT_480 = ", changeContext);";
protected final String TEXT_481 = NL + "\t\treturn basicAdd(get";
- protected final String TEXT_482 = "(), getType(), ";
+ protected final String TEXT_482 = "(), getType(), INTERNAL_";
protected final String TEXT_483 = ", new";
protected final String TEXT_484 = ", changeContext);";
protected final String TEXT_485 = NL + "\t\t// TODO: implement this method to set the contained '";
@@ -875,7 +875,7 @@
protected final String TEXT_855 = "_set_";
protected final String TEXT_856 = ");";
protected final String TEXT_857 = NL + " unset(get";
- protected final String TEXT_858 = "(), getType(), ";
+ protected final String TEXT_858 = "(), getType(), INTERNAL_";
protected final String TEXT_859 = ");";
protected final String TEXT_860 = NL + " unset";
protected final String TEXT_861 = "(get";
@@ -923,7 +923,7 @@
protected final String TEXT_903 = NL + "\t\treturn ";
protected final String TEXT_904 = "_set_;";
protected final String TEXT_905 = NL + " return isSet(get";
- protected final String TEXT_906 = "(), getType(), ";
+ protected final String TEXT_906 = "(), getType(), INTERNAL_";
protected final String TEXT_907 = ");";
protected final String TEXT_908 = NL + "\t\treturn !((";
protected final String TEXT_909 = ".Internal)get";
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=521017&r1=521016&r2=521017
==============================================================================
--- incubator/tuscany/java/sdo/tools/templates/models/SDOClass.javajet (original)
+++ incubator/tuscany/java/sdo/tools/templates/models/SDOClass.javajet Wed Mar 21 15:02:13 2007
@@ -698,14 +698,13 @@
<%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature(); // AAAA%>
<%if (genFeature.isFeatureMapType()) {%>
<%if (delegateFeature.isWrappedFeatureMapType()) {%>
- return create<%=genFeature.getImportedType()%>(get<%=delegateFeature.getAccessorName()%>(), getType(), <%=genFeature.getUpperName()%>);
+ return create<%=genFeature.getImportedType()%>(get<%=delegateFeature.getAccessorName()%>(), getType(), INTERNAL_<%=genFeature.getUpperName()%>);
<%} else {%>
return (<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>)get<%=delegateFeature.getAccessorName()%>()).list(<%=genFeature.getQualifiedFeatureAccessor()%>);
<%}%>
<%} else if (genFeature.isListType()) {%>
<%if (delegateFeature.isWrappedFeatureMapType()) {%>
- return get<%=genFeature.getImportedType()%>(get<%=delegateFeature.getAccessorName()%>(), getType(), <%=genFeature.getUpperName()%>);
-
+ return get<%=genFeature.getImportedType()%>(get<%=delegateFeature.getAccessorName()%>(), getType(), INTERNAL_<%=genFeature.getUpperName()%>);
<%} else {%>
return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>)get<%=delegateFeature.getAccessorName()%>()).list(<%=genFeature.getQualifiedFeatureAccessor()%>);
<%}%>
@@ -713,7 +712,7 @@
<%if (delegateFeature.isWrappedFeatureMapType()) {%>
return <%if (genFeature.isPrimitiveType()) {%>(<%}%>(<%=genFeature.getObjectType()%>)get(get<%=delegateFeature.getAccessorName()%>(), getType(), INTERNAL_<%=genFeature.getUpperName()%>)<%if (genFeature.isPrimitiveType()) {%>).<%=genFeature.getPrimitiveValueFunction()%>()<%}%>;
<%} else {%>
- return <%if (genFeature.isPrimitiveType()) {%>(<%}%>(<%=genFeature.getObjectType()%>)get(get<%=delegateFeature.getAccessorName()%>(), getType(), INTERNAL_<%=genFeature.getUpperName()%>);<%if (genFeature.isPrimitiveType()) {%>).<%=genFeature.getPrimitiveValueFunction()%>()<%}%>;
+ return <%if (genFeature.isPrimitiveType()) {%>(<%}%>(<%=genFeature.getObjectType()%>)get(get<%=delegateFeature.getAccessorName()%>(), getType(), INTERNAL_<%=genFeature.getUpperName()%>)<%if (genFeature.isPrimitiveType()) {%>).<%=genFeature.getPrimitiveValueFunction()%>()<%}%>;
<%}%>
<%}%>
<%} else {%>
@@ -751,7 +750,7 @@
<%}%>
<%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature(); //BBBB%>
<%if (delegateFeature.isWrappedFeatureMapType()) {%>
- return (<%=genFeature.getImportedType()%>)get(get<%=delegateFeature.getAccessorName()%>(), getType(), <%=genFeature.getUpperName()%>);
+ return (<%=genFeature.getImportedType()%>)get(get<%=delegateFeature.getAccessorName()%>(), getType(), INTERNAL_<%=genFeature.getUpperName()%>);
<%} else {%>
return (<%=genFeature.getImportedType()%>)get<%=delegateFeature.getAccessorName()%>().get(<%=genFeature.getQualifiedFeatureAccessor()%>, false);
<%}%>
@@ -811,9 +810,9 @@
return changeContext;
<%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature(); //CCCC%>
<%if (delegateFeature.isWrappedFeatureMapType()) {%>
- return basicAdd(get<%=delegateFeature.getAccessorName()%>(), getType(), <%=genFeature.getUpperName()%>, new<%=genFeature.getCapName()%>, changeContext);
+ return basicAdd(get<%=delegateFeature.getAccessorName()%>(), getType(), INTERNAL_<%=genFeature.getUpperName()%>, new<%=genFeature.getCapName()%>, changeContext);
<%} else {%>
- return basicAdd(get<%=delegateFeature.getAccessorName()%>(), getType(), <%=genFeature.getUpperName()%>, new<%=genFeature.getCapName()%>, changeContext);
+ return basicAdd(get<%=delegateFeature.getAccessorName()%>(), getType(), INTERNAL_<%=genFeature.getUpperName()%>, new<%=genFeature.getCapName()%>, changeContext);
<%}%>
<%} else {%>
<%@ include file="Class/basicSetGenFeature.TODO.override.javajetinc" fail="alternative" %>
@@ -1185,7 +1184,7 @@
<%}%>
<%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature(); //EEEE%>
<%if (delegateFeature.isWrappedFeatureMapType()) {%>
- unset(get<%=delegateFeature.getAccessorName()%>(), getType(), <%=genFeature.getUpperName()%>);
+ unset(get<%=delegateFeature.getAccessorName()%>(), getType(), INTERNAL_<%=genFeature.getUpperName()%>);
<%} else {%>
unset<%=genFeature.getImportedType()%>(get<%=delegateFeature.getAccessorName()%>());
<%}%>
@@ -1252,7 +1251,7 @@
<%}%>
<%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature(); //FFFF%>
<%if (delegateFeature.isWrappedFeatureMapType()) {%>
- return isSet(get<%=delegateFeature.getAccessorName()%>(), getType(), <%=genFeature.getUpperName()%>);
+ return isSet(get<%=delegateFeature.getAccessorName()%>(), getType(), INTERNAL_<%=genFeature.getUpperName()%>);
<%} else {%>
return !((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)get<%=delegateFeature.getAccessorName()%>()).isEmpty(<%=genFeature.getQualifiedFeatureAccessor()%>);
<%}%>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org