You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by am...@apache.org on 2008/01/25 11:25:30 UTC
svn commit: r615169 - in /incubator/tuscany/java/sdo: tools-test/
tools-test/src/main/resources/
tools-test/src/test/java/org/apache/tuscany/sdo/test/
tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/
tools/templates/models/
Author: amita
Date: Fri Jan 25 02:25:28 2008
New Revision: 615169
URL: http://svn.apache.org/viewvc?rev=615169&view=rev
Log:
TUSCANY-1483 Elements named internal faced problems during SDO code generation
Added:
incubator/tuscany/java/sdo/tools-test/src/main/resources/InternalInElement.xsd
incubator/tuscany/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/InternalInElementTestCase.java
Modified:
incubator/tuscany/java/sdo/tools-test/pom.xml
incubator/tuscany/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
incubator/tuscany/java/sdo/tools/templates/models/SDOClass.javajet
incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet
Modified: incubator/tuscany/java/sdo/tools-test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools-test/pom.xml?rev=615169&r1=615168&r2=615169&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/tools-test/pom.xml (original)
+++ incubator/tuscany/java/sdo/tools-test/pom.xml Fri Jan 25 02:25:28 2008
@@ -243,6 +243,17 @@
<goal>generate</goal>
</goals>
</execution>
+ <execution>
+ <id>InternalInElement</id>
+ <configuration>
+ <schemaFile>
+ ${basedir}/src/main/resources/InternalInElement.xsd
+ </schemaFile>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
</plugins>
Added: incubator/tuscany/java/sdo/tools-test/src/main/resources/InternalInElement.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools-test/src/main/resources/InternalInElement.xsd?rev=615169&view=auto
==============================================================================
--- incubator/tuscany/java/sdo/tools-test/src/main/resources/InternalInElement.xsd (added)
+++ incubator/tuscany/java/sdo/tools-test/src/main/resources/InternalInElement.xsd Fri Jan 25 02:25:28 2008
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ -->
+ <xsd:schema xmlns:tns="http://www.example.com/internal"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://www.example.com/internal">
+
+ <xsd:element name="Wrapper" type="tns:Wrapper" />
+ <xsd:complexType name="Wrapper" >
+ <xsd:sequence>
+ <xsd:element name="abc" type="xsd:integer"/>
+ <xsd:element name="internalAbc" type="xsd:integer"/>
+ </xsd:sequence>
+ </xsd:complexType>
+</xsd:schema>
Modified: incubator/tuscany/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/AllTests.java?rev=615169&r1=615168&r2=615169&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/AllTests.java (original)
+++ incubator/tuscany/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/AllTests.java Fri Jan 25 02:25:28 2008
@@ -36,7 +36,10 @@
suite.addTestSuite(OpenContentTestCase.class);
suite.addTestSuite(SimpleStaticTestCase.class);
suite.addTestSuite(MixedTypesTestCase.class);
-
+ suite.addTestSuite(DataObjectGetListTestCase.class);
+ suite.addTestSuite(ListWithDefaultTestCase.class);
+ suite.addTestSuite(SubstitutionWithExtensionValuesTestCase.class);
+ suite.addTestSuite(InternalInElementTestCase.class);
return suite;
}
@@ -49,5 +52,6 @@
junit.textui.TestRunner.run(suite());
}
}
+
Added: incubator/tuscany/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/InternalInElementTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/InternalInElementTestCase.java?rev=615169&view=auto
==============================================================================
--- incubator/tuscany/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/InternalInElementTestCase.java (added)
+++ incubator/tuscany/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/InternalInElementTestCase.java Fri Jan 25 02:25:28 2008
@@ -0,0 +1,63 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.sdo.test;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sdo.api.SDOUtil;
+import org.apache.tuscany.sdo.generate.XSD2JavaGenerator;
+
+import com.example.internal.InternalFactory;
+import com.example.internal.Wrapper;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
+
+public class InternalInElementTestCase extends TestCase {
+ HelperContext scope;
+
+ /*TUSCANy-1483 check correct code generation for internalAbc */
+ public void testPackageValidityWithInternalInElement() throws Exception {
+ //if dob is instantiated, it proves that the code got generated without any duplicates
+ //without the fix,
+ //public final static int INTERNAL_ABC = 1;
+ //public final static int INTERNAL_ABC = 0;
+ //was getting generated and so invalid java class WrapperImpl.java.
+ InternalFactory.INSTANCE.register(scope);
+ DataObject dob = scope.getDataFactory().create(Wrapper.class);
+
+ assertTrue(true);
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ scope = SDOUtil.createHelperContext();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+}
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?rev=615169&r1=615168&r2=615169&view=diff
==============================================================================
--- 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 Fri Jan 25 02:25:28 2008
@@ -92,13 +92,13 @@
protected final String TEXT_72 = NL + "\t/**" + NL + "\t * The internal feature id for the '<em><b>";
protected final String TEXT_73 = "</b></em>' ";
protected final String TEXT_74 = "." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t * @ordered" + NL + "\t */";
- protected final String TEXT_75 = " " + NL + "\tpublic final static int INTERNAL_";
+ protected final String TEXT_75 = " " + NL + "\tpublic final static int _INTERNAL_";
protected final String TEXT_76 = " = ";
protected final String TEXT_77 = ";" + NL;
protected final String TEXT_78 = NL + "\t/**" + NL + "\t * The number of properties for this type." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t * @ordered" + NL + "\t */";
protected final String TEXT_79 = NL + "\tpublic final static int INTERNAL_PROPERTY_COUNT = ";
protected final String TEXT_80 = ";" + NL + "" + NL + "\tprotected int internalConvertIndex(int internalIndex)" + NL + "\t{" + NL + "\t\tswitch (internalIndex)" + NL + "\t\t{";
- protected final String TEXT_81 = NL + "\t\t\tcase INTERNAL_";
+ protected final String TEXT_81 = NL + "\t\t\tcase _INTERNAL_";
protected final String TEXT_82 = ": return ";
protected final String TEXT_83 = ";";
protected final String TEXT_84 = NL + "\t\t}" + NL + "\t\treturn super.internalConvertIndex(internalIndex);" + NL + "\t}" + NL + NL;
@@ -305,7 +305,7 @@
protected final String TEXT_285 = " = new ";
protected final String TEXT_286 = ");";
protected final String TEXT_287 = NL + "\t\t ";
- protected final String TEXT_288 = " = createSequence(INTERNAL_";
+ protected final String TEXT_288 = " = createSequence(_INTERNAL_";
protected final String TEXT_289 = ");";
protected final String TEXT_290 = NL + "\t\t ";
protected final String TEXT_291 = " = createPropertyList(";
@@ -361,7 +361,7 @@
protected final String TEXT_341 = NL + "\t\t\t\teVirtualSet(";
protected final String TEXT_342 = ", ";
protected final String TEXT_343 = ");";
- protected final String TEXT_344 = NL + "\t\t\t\tif (isNotifying())" + NL + "\t\t\t\t\tnotify(ChangeKind.RESOLVE, INTERNAL_";
+ protected final String TEXT_344 = NL + "\t\t\t\tif (isNotifying())" + NL + "\t\t\t\t\tnotify(ChangeKind.RESOLVE, _INTERNAL_";
protected final String TEXT_345 = ", old";
protected final String TEXT_346 = ", ";
protected final String TEXT_347 = ");";
@@ -388,7 +388,7 @@
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(), INTERNAL_";
+ 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 = ")((";
@@ -397,7 +397,7 @@
protected final String TEXT_377 = ");";
protected final String TEXT_378 = NL + "\t\treturn get";
protected final String TEXT_379 = "(get";
- protected final String TEXT_380 = "(), getType(), INTERNAL_";
+ 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";
@@ -407,7 +407,7 @@
protected final String TEXT_387 = "(";
protected final String TEXT_388 = "(";
protected final String TEXT_389 = ")get(get";
- protected final String TEXT_390 = "(), getType(), INTERNAL_";
+ protected final String TEXT_390 = "(), getType(), _INTERNAL_";
protected final String TEXT_391 = ")";
protected final String TEXT_392 = ").";
protected final String TEXT_393 = "()";
@@ -416,7 +416,7 @@
protected final String TEXT_396 = "(";
protected final String TEXT_397 = "(";
protected final String TEXT_398 = ")get(get";
- protected final String TEXT_399 = "(), getType(), INTERNAL_";
+ protected final String TEXT_399 = "(), getType(), _INTERNAL_";
protected final String TEXT_400 = ")";
protected final String TEXT_401 = ").";
protected final String TEXT_402 = "()";
@@ -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(), INTERNAL_";
+ 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";
@@ -475,7 +475,7 @@
protected final String TEXT_455 = "_set_;" + NL + "\t\t";
protected final String TEXT_456 = "_set_ = true;";
protected final String TEXT_457 = NL + "\t\tif (isNotifying())" + NL + "\t\t{";
- protected final String TEXT_458 = NL + "\t\t\taddNotification(this, ChangeKind.SET, INTERNAL_";
+ protected final String TEXT_458 = NL + "\t\t\taddNotification(this, ChangeKind.SET, _INTERNAL_";
protected final String TEXT_459 = ", ";
protected final String TEXT_460 = "isSetChange ? null : old";
protected final String TEXT_461 = "old";
@@ -485,7 +485,7 @@
protected final String TEXT_465 = "!old";
protected final String TEXT_466 = "_set_";
protected final String TEXT_467 = ", changeContext);";
- protected final String TEXT_468 = NL + "\t\t\taddNotification(this, ChangeKind.SET, INTERNAL_";
+ protected final String TEXT_468 = NL + "\t\t\taddNotification(this, ChangeKind.SET, _INTERNAL_";
protected final String TEXT_469 = ", ";
protected final String TEXT_470 = "old";
protected final String TEXT_471 = " == EVIRTUAL_NO_VALUE ? null : old";
@@ -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(), INTERNAL_";
+ 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(), INTERNAL_";
+ 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 '";
@@ -552,7 +552,7 @@
protected final String TEXT_532 = ")new";
protected final String TEXT_533 = ", ";
protected final String TEXT_534 = ", changeContext);" + NL + "\t\t\tif (changeContext != null) dispatch(changeContext);" + NL + "\t\t}";
- protected final String TEXT_535 = NL + "\t\telse if (isNotifying())" + NL + "\t\t\tnotify(ChangeKind.SET, INTERNAL_";
+ protected final String TEXT_535 = NL + "\t\telse if (isNotifying())" + NL + "\t\t\tnotify(ChangeKind.SET, _INTERNAL_";
protected final String TEXT_536 = ", new";
protected final String TEXT_537 = ", new";
protected final String TEXT_538 = ");";
@@ -566,10 +566,10 @@
protected final String TEXT_546 = ")" + NL + "\t\t{" + NL + "\t\t\tChangeContext changeContext = null;" + NL + "\t\t\tif (";
protected final String TEXT_547 = " != null)";
protected final String TEXT_548 = NL + "\t\t\t\tchangeContext = inverseRemove(";
- protected final String TEXT_549 = ", this, OPPOSITE_FEATURE_BASE - INTERNAL_";
+ protected final String TEXT_549 = ", this, OPPOSITE_FEATURE_BASE - _INTERNAL_";
protected final String TEXT_550 = ", null, changeContext);" + NL + "\t\t\tif (new";
protected final String TEXT_551 = " != null)" + NL + "\t\t\t\tchangeContext = inverseAdd(new";
- protected final String TEXT_552 = ", this, OPPOSITE_FEATURE_BASE - INTERNAL_";
+ protected final String TEXT_552 = ", this, OPPOSITE_FEATURE_BASE - _INTERNAL_";
protected final String TEXT_553 = ", null, changeContext);";
protected final String TEXT_554 = NL + "\t\t\t\tchangeContext = inverseRemove(";
protected final String TEXT_555 = ", this, ";
@@ -599,13 +599,13 @@
protected final String TEXT_579 = "_set_;";
protected final String TEXT_580 = NL + "\t\t\t";
protected final String TEXT_581 = "_set_ = true;";
- protected final String TEXT_582 = NL + "\t\t\tif (isNotifying())" + NL + "\t\t\t\tnotify(ChangeKind.SET, INTERNAL_";
+ protected final String TEXT_582 = NL + "\t\t\tif (isNotifying())" + NL + "\t\t\t\tnotify(ChangeKind.SET, _INTERNAL_";
protected final String TEXT_583 = ", new";
protected final String TEXT_584 = ", new";
protected final String TEXT_585 = ", !old";
protected final String TEXT_586 = "_set_);";
protected final String TEXT_587 = NL + "\t\t}";
- protected final String TEXT_588 = NL + "\t\telse if (isNotifying())" + NL + "\t\t\tnotify(ChangeKind.SET, INTERNAL_";
+ protected final String TEXT_588 = NL + "\t\telse if (isNotifying())" + NL + "\t\t\tnotify(ChangeKind.SET, _INTERNAL_";
protected final String TEXT_589 = ", new";
protected final String TEXT_590 = ", new";
protected final String TEXT_591 = ");";
@@ -662,7 +662,7 @@
protected final String TEXT_642 = "_set_;";
protected final String TEXT_643 = NL + "\t\t";
protected final String TEXT_644 = "_set_ = true;";
- protected final String TEXT_645 = NL + "\t\tif (isNotifying())" + NL + "\t\t\tnotify(ChangeKind.SET, INTERNAL_";
+ protected final String TEXT_645 = NL + "\t\tif (isNotifying())" + NL + "\t\t\tnotify(ChangeKind.SET, _INTERNAL_";
protected final String TEXT_646 = ", ";
protected final String TEXT_647 = "isSetChange ? ";
protected final String TEXT_648 = "null";
@@ -676,7 +676,7 @@
protected final String TEXT_656 = "!old";
protected final String TEXT_657 = "_set_";
protected final String TEXT_658 = ");";
- protected final String TEXT_659 = NL + "\t\tif (isNotifying())" + NL + "\t\t\tnotify(ChangeKind.SET, INTERNAL_";
+ protected final String TEXT_659 = NL + "\t\tif (isNotifying())" + NL + "\t\t\tnotify(ChangeKind.SET, _INTERNAL_";
protected final String TEXT_660 = ", ";
protected final String TEXT_661 = "old";
protected final String TEXT_662 = " == EVIRTUAL_NO_VALUE ? ";
@@ -688,7 +688,7 @@
protected final String TEXT_668 = "new";
protected final String TEXT_669 = ");";
protected final String TEXT_670 = NL + "\t\tset(get";
- protected final String TEXT_671 = "(), getType(), INTERNAL_";
+ protected final String TEXT_671 = "(), getType(), _INTERNAL_";
protected final String TEXT_672 = ", ";
protected final String TEXT_673 = " new ";
protected final String TEXT_674 = "(";
@@ -731,7 +731,7 @@
protected final String TEXT_711 = "_set_;" + NL + "\t\t";
protected final String TEXT_712 = "_set_ = false;";
protected final String TEXT_713 = NL + "\t\tif (isNotifying())" + NL + "\t\t{";
- protected final String TEXT_714 = NL + "\t\t\taddNotification(this, ChangeKind.UNSET, INTERNAL_";
+ protected final String TEXT_714 = NL + "\t\t\taddNotification(this, ChangeKind.UNSET, _INTERNAL_";
protected final String TEXT_715 = ", ";
protected final String TEXT_716 = "isSetChange ? null : old";
protected final String TEXT_717 = "old";
@@ -740,7 +740,7 @@
protected final String TEXT_720 = "!old";
protected final String TEXT_721 = "_set_";
protected final String TEXT_722 = ", changeContext);";
- protected final String TEXT_723 = NL + "\t\t\taddNotification(this, ChangeKind.UNSET, INTERNAL_";
+ protected final String TEXT_723 = NL + "\t\t\taddNotification(this, ChangeKind.UNSET, _INTERNAL_";
protected final String TEXT_724 = ", ";
protected final String TEXT_725 = "old";
protected final String TEXT_726 = " == EVIRTUAL_NO_VALUE ? null : old";
@@ -783,7 +783,7 @@
protected final String TEXT_763 = NL + "\t\tif (";
protected final String TEXT_764 = " != null)" + NL + "\t\t{" + NL + "\t\t\tChangeContext changeContext = null;";
protected final String TEXT_765 = NL + "\t\t\tchangeContext = inverseRemove(";
- protected final String TEXT_766 = ", this, EOPPOSITE_FEATURE_BASE - INTERNAL_";
+ protected final String TEXT_766 = ", this, EOPPOSITE_FEATURE_BASE - _INTERNAL_";
protected final String TEXT_767 = ", null, changeContext);";
protected final String TEXT_768 = NL + "\t\t\tchangeContext = inverseRemove(";
protected final String TEXT_769 = ", this, ";
@@ -806,7 +806,7 @@
protected final String TEXT_786 = "_set_;";
protected final String TEXT_787 = NL + "\t\t\t";
protected final String TEXT_788 = "_set_ = false;";
- protected final String TEXT_789 = NL + "\t\t\tif (isNotifying())" + NL + "\t\t\t\tnotify(ChangeKind.UNSET, INTERNAL_";
+ protected final String TEXT_789 = NL + "\t\t\tif (isNotifying())" + NL + "\t\t\t\tnotify(ChangeKind.UNSET, _INTERNAL_";
protected final String TEXT_790 = ", null, null, old";
protected final String TEXT_791 = "_set_);";
protected final String TEXT_792 = NL + " \t}";
@@ -838,7 +838,7 @@
protected final String TEXT_818 = "_ESETFLAG;";
protected final String TEXT_819 = NL + "\t\t";
protected final String TEXT_820 = "_set_ = false;";
- protected final String TEXT_821 = NL + "\t\tif (isNotifying())" + NL + "\t\t\tnotify(ChangeKind.UNSET, INTERNAL_";
+ protected final String TEXT_821 = NL + "\t\tif (isNotifying())" + NL + "\t\t\tnotify(ChangeKind.UNSET, _INTERNAL_";
protected final String TEXT_822 = ", ";
protected final String TEXT_823 = "isSetChange ? old";
protected final String TEXT_824 = " : null";
@@ -862,7 +862,7 @@
protected final String TEXT_842 = "_ESETFLAG;";
protected final String TEXT_843 = NL + "\t\t";
protected final String TEXT_844 = "_set_ = false;";
- protected final String TEXT_845 = NL + "\t\tif (isNotifying())" + NL + "\t\t\tnotify(ChangeKind.UNSET, INTERNAL_";
+ protected final String TEXT_845 = NL + "\t\tif (isNotifying())" + NL + "\t\t\tnotify(ChangeKind.UNSET, _INTERNAL_";
protected final String TEXT_846 = ", ";
protected final String TEXT_847 = "isSetChange ? old";
protected final String TEXT_848 = " : ";
@@ -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(), INTERNAL_";
+ 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(), INTERNAL_";
+ 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";
@@ -1561,7 +1561,7 @@
int baseCount = base.getFeatureCount();
if (g < baseCount)
{
- featureValue = base.getImportedClassName() + ".INTERNAL_" + genFeature.getUpperName();
+ featureValue = base.getImportedClassName() + "._INTERNAL_" + genFeature.getUpperName();
} else {
String baseCountID = base.getImportedClassName() + "." + "INTERNAL_PROPERTY_COUNT";
featureValue = baseCountID + " + " + Integer.toString(g - baseCount);
Modified: incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java?rev=615169&r1=615168&r2=615169&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java (original)
+++ incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java Fri Jan 25 02:25:28 2008
@@ -148,7 +148,7 @@
protected final String TEXT_108 = NL + "\t\tcreateProperty(";
protected final String TEXT_109 = ", ";
protected final String TEXT_110 = "Type,";
- protected final String TEXT_111 = ".INTERNAL_";
+ protected final String TEXT_111 = "._INTERNAL_";
protected final String TEXT_112 = "); ";
protected final String TEXT_113 = NL + NL + "\t\t// Create data types";
protected final String TEXT_114 = NL + "\t\t";
@@ -1129,4 +1129,4 @@
stringBuffer.append(TEXT_313);
return stringBuffer.toString();
}
-}
\ No newline at end of file
+}
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?rev=615169&r1=615168&r2=615169&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/tools/templates/models/SDOClass.javajet (original)
+++ incubator/tuscany/java/sdo/tools/templates/models/SDOClass.javajet Fri Jan 25 02:25:28 2008
@@ -264,13 +264,13 @@
<%int baseCount = base.getFeatureCount();%>
<%if (g < baseCount)%>
<%{%>
- <%featureValue = base.getImportedClassName() + ".INTERNAL_" + genFeature.getUpperName();%>
+ <%featureValue = base.getImportedClassName() + "._INTERNAL_" + genFeature.getUpperName();%>
<%} else {%>
<%String baseCountID = base.getImportedClassName() + "." + "INTERNAL_PROPERTY_COUNT";%>
<%featureValue = baseCountID + " + " + Integer.toString(g - baseCount);%>
<%}%>
<%}%>
- public final static int INTERNAL_<%=genFeature.getUpperName()%> = <%=featureValue%>;
+ public final static int _INTERNAL_<%=genFeature.getUpperName()%> = <%=featureValue%>;
<%}%>
/**
@@ -297,7 +297,7 @@
switch (internalIndex)
{
<%for (Iterator f=genClass.getAllGenFeatures().iterator(); f.hasNext();) { GenFeature genFeature = (GenFeature)f.next();%>
- case INTERNAL_<%=genFeature.getUpperName()%>: return <%=genFeature.getUpperName()%>;
+ case _INTERNAL_<%=genFeature.getUpperName()%>: return <%=genFeature.getUpperName()%>;
<%}%>
}
return super.internalConvertIndex(internalIndex);
@@ -649,7 +649,7 @@
eVirtualSet(<%=genFeature.getUpperName()%>, <%=genFeature.getSafeName()%> = new <%=genClass.getListConstructor(genFeature)%>);
<%} else {
if (genFeature.getType().equals("commonj.sdo.Sequence")){%>
- <%=genFeature.getSafeName()%> = createSequence(INTERNAL_<%=genFeature.getUpperName()%>);<%} else {%>
+ <%=genFeature.getSafeName()%> = createSequence(_INTERNAL_<%=genFeature.getUpperName()%>);<%} else {%>
<%=genFeature.getSafeName()%> = createPropertyList(<%=SDOGenUtil.getListKind(genFeature, genFeature.isUnsettable())%>, <%=genFeature.getListItemType()%>.class, <%=genFeature.getUpperName()%>, <%=genFeature.isBidirectional()?genFeature.getReverse().getUpperName():"0" %>);<%}}%>
}
return <%=genFeature.getSafeName()%><%=genFeature.isMapType() && genFeature.isEffectiveSuppressEMFTypes() ? ".map()" : ""%>;
@@ -688,7 +688,7 @@
<%}%>
<%if (!genModel.isSuppressNotification()) {%>
if (isNotifying())
- notify(ChangeKind.RESOLVE, INTERNAL_<%=genFeature.getUpperName()%>, old<%=genFeature.getCapName()%>, <%=genFeature.getSafeName()%>);
+ notify(ChangeKind.RESOLVE, _INTERNAL_<%=genFeature.getUpperName()%>, old<%=genFeature.getCapName()%>, <%=genFeature.getSafeName()%>);
<%}%>
}
}
@@ -708,21 +708,21 @@
<%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature(); // AAAA%>
<%if (genFeature.isFeatureMapType()) {%>
<%if (delegateFeature.isWrappedFeatureMapType()) {%>
- return create<%=genFeature.getImportedType()%>(get<%=delegateFeature.getAccessorName()%>(), getType(), INTERNAL_<%=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(), INTERNAL_<%=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()%>);
<%}%>
<%} else {%>
<%if (delegateFeature.isWrappedFeatureMapType()) {%>
- 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 {%>
- 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 {%>
@@ -760,7 +760,7 @@
<%}%>
<%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature(); //BBBB%>
<%if (delegateFeature.isWrappedFeatureMapType()) {%>
- return (<%=genFeature.getImportedType()%>)get(get<%=delegateFeature.getAccessorName()%>(), getType(), INTERNAL_<%=genFeature.getUpperName()%>);
+ return (<%=genFeature.getImportedType()%>)get(get<%=delegateFeature.getAccessorName()%>(), getType(), _INTERNAL_<%=genFeature.getUpperName()%>);
<%} else {%>
return (<%=genFeature.getImportedType()%>)get<%=delegateFeature.getAccessorName()%>().get(<%=genFeature.getQualifiedFeatureAccessor()%>, false);
<%}%>
@@ -810,9 +810,9 @@
if (isNotifying())
{
<%if (genFeature.isUnsettable()) {%>
- addNotification(this, ChangeKind.SET, INTERNAL_<%=genFeature.getUpperName()%>, <%if (genModel.isVirtualDelegation()) {%>isSetChange ? null : old<%=genFeature.getCapName()%><%} else {%>old<%=genFeature.getCapName()%><%}%>, new<%=genFeature.getCapName()%>, <%if (genModel.isVirtualDelegation()) {%>isSetChange<%} else {%>!old<%=genFeature.getCapName()%>_set_<%}%>, changeContext);
+ addNotification(this, ChangeKind.SET, _INTERNAL_<%=genFeature.getUpperName()%>, <%if (genModel.isVirtualDelegation()) {%>isSetChange ? null : old<%=genFeature.getCapName()%><%} else {%>old<%=genFeature.getCapName()%><%}%>, new<%=genFeature.getCapName()%>, <%if (genModel.isVirtualDelegation()) {%>isSetChange<%} else {%>!old<%=genFeature.getCapName()%>_set_<%}%>, changeContext);
<%} else {%>
- addNotification(this, ChangeKind.SET, INTERNAL_<%=genFeature.getUpperName()%>, <%if (genModel.isVirtualDelegation()) {%>old<%=genFeature.getCapName()%> == EVIRTUAL_NO_VALUE ? null : old<%=genFeature.getCapName()%><%} else {%>old<%=genFeature.getCapName()%><%}%>, new<%=genFeature.getCapName()%>, changeContext);
+ addNotification(this, ChangeKind.SET, _INTERNAL_<%=genFeature.getUpperName()%>, <%if (genModel.isVirtualDelegation()) {%>old<%=genFeature.getCapName()%> == EVIRTUAL_NO_VALUE ? null : old<%=genFeature.getCapName()%><%} else {%>old<%=genFeature.getCapName()%><%}%>, new<%=genFeature.getCapName()%>, changeContext);
<%}%>
}
<%}%>
@@ -820,9 +820,9 @@
return changeContext;
<%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature(); //CCCC%>
<%if (delegateFeature.isWrappedFeatureMapType()) {%>
- return basicAdd(get<%=delegateFeature.getAccessorName()%>(), getType(), INTERNAL_<%=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(), INTERNAL_<%=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" %>
@@ -894,7 +894,7 @@
}
<%if (!genModel.isSuppressNotification()) {%>
else if (isNotifying())
- notify(ChangeKind.SET, INTERNAL_<%=genFeature.getUpperName()%>, new<%=genFeature.getCapName()%>, new<%=genFeature.getCapName()%>);
+ notify(ChangeKind.SET, _INTERNAL_<%=genFeature.getUpperName()%>, new<%=genFeature.getCapName()%>, new<%=genFeature.getCapName()%>);
<%}%>
<%} else if (genFeature.isBidirectional() || genFeature.isEffectiveContains()) {%>
<%if (genModel.isVirtualDelegation()) {%>
@@ -905,9 +905,9 @@
ChangeContext changeContext = null;
if (<%=genFeature.getSafeName()%> != null)
<%if (!genFeature.isBidirectional()) {%>
- changeContext = inverseRemove(<%=genFeature.getSafeName()%>, this, OPPOSITE_FEATURE_BASE - INTERNAL_<%=genFeature.getUpperName()%>, null, changeContext);
+ changeContext = inverseRemove(<%=genFeature.getSafeName()%>, this, OPPOSITE_FEATURE_BASE - _INTERNAL_<%=genFeature.getUpperName()%>, null, changeContext);
if (new<%=genFeature.getCapName()%> != null)
- changeContext = inverseAdd(new<%=genFeature.getCapName()%>, this, OPPOSITE_FEATURE_BASE - INTERNAL_<%=genFeature.getUpperName()%>, null, changeContext);
+ changeContext = inverseAdd(new<%=genFeature.getCapName()%>, this, OPPOSITE_FEATURE_BASE - _INTERNAL_<%=genFeature.getUpperName()%>, null, changeContext);
<%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass();%>
changeContext = inverseRemove(<%=genFeature.getSafeName()%>, this, <%=SDOGenUtil.getQualifiedInternalPropertyID(reverseFeature)%>, <%=targetClass.getImportedInterfaceName()%>.class, changeContext);
if (new<%=genFeature.getCapName()%> != null)
@@ -934,13 +934,13 @@
<%}%>
<%if (!genModel.isSuppressNotification()) {%>
if (isNotifying())
- notify(ChangeKind.SET, INTERNAL_<%=genFeature.getUpperName()%>, new<%=genFeature.getCapName()%>, new<%=genFeature.getCapName()%>, !old<%=genFeature.getCapName()%>_set_);
+ notify(ChangeKind.SET, _INTERNAL_<%=genFeature.getUpperName()%>, new<%=genFeature.getCapName()%>, new<%=genFeature.getCapName()%>, !old<%=genFeature.getCapName()%>_set_);
<%}%>
}
<%} else {%>
<%if (!genModel.isSuppressNotification()) {%>
else if (isNotifying())
- notify(ChangeKind.SET, INTERNAL_<%=genFeature.getUpperName()%>, new<%=genFeature.getCapName()%>, new<%=genFeature.getCapName()%>);
+ notify(ChangeKind.SET, _INTERNAL_<%=genFeature.getUpperName()%>, new<%=genFeature.getCapName()%>, new<%=genFeature.getCapName()%>);
<%}%>
<%}%>
<%} else {%>
@@ -988,19 +988,19 @@
<%}%>
<%if (!genModel.isSuppressNotification()) {%>
if (isNotifying())
- notify(ChangeKind.SET, INTERNAL_<%=genFeature.getUpperName()%>, <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>isSetChange ? <%if (genFeature.isReferenceType()) {%>null<%} else {%><%=genFeature.getUpperName()%>_DEFAULT_<%}%> : old<%=genFeature.getCapName()%><%} else {%>old<%=genFeature.getCapName()%><%}%>, <%if (genClass.isFlag(genFeature)) {%>new<%=genFeature.getCapName()%><%} else {%><%=genFeature.getSafeName()%><%}%>, <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>isSetChange<%} else {%>!old<%=genFeature.getCapName()%>_set_<%}%>);
+ notify(ChangeKind.SET, _INTERNAL_<%=genFeature.getUpperName()%>, <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>isSetChange ? <%if (genFeature.isReferenceType()) {%>null<%} else {%><%=genFeature.getUpperName()%>_DEFAULT_<%}%> : old<%=genFeature.getCapName()%><%} else {%>old<%=genFeature.getCapName()%><%}%>, <%if (genClass.isFlag(genFeature)) {%>new<%=genFeature.getCapName()%><%} else {%><%=genFeature.getSafeName()%><%}%>, <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>isSetChange<%} else {%>!old<%=genFeature.getCapName()%>_set_<%}%>);
<%}%>
<%} else {%>
<%if (!genModel.isSuppressNotification()) {%>
if (isNotifying())
- notify(ChangeKind.SET, INTERNAL_<%=genFeature.getUpperName()%>, <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>old<%=genFeature.getCapName()%> == EVIRTUAL_NO_VALUE ? <%if (genFeature.isReferenceType()) {%>null<%} else {%><%=genFeature.getUpperName()%>_DEFAULT_<%}%> : old<%=genFeature.getCapName()%><%} else {%>old<%=genFeature.getCapName()%><%}%>, <%if (genClass.isFlag(genFeature)) {%>new<%=genFeature.getCapName()%><%} else {%><%=genFeature.getSafeName()%><%}%>);
+ notify(ChangeKind.SET, _INTERNAL_<%=genFeature.getUpperName()%>, <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>old<%=genFeature.getCapName()%> == EVIRTUAL_NO_VALUE ? <%if (genFeature.isReferenceType()) {%>null<%} else {%><%=genFeature.getUpperName()%>_DEFAULT_<%}%> : old<%=genFeature.getCapName()%><%} else {%>old<%=genFeature.getCapName()%><%}%>, <%if (genClass.isFlag(genFeature)) {%>new<%=genFeature.getCapName()%><%} else {%><%=genFeature.getSafeName()%><%}%>);
<%}%>
<%}%>
<%}%>
<%@ include file="Class/setGenFeature.post.insert.javajetinc" fail="silent" %>
<%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature(); // DDDD%>
<%if (delegateFeature.isWrappedFeatureMapType()) {%>
- set(get<%=delegateFeature.getAccessorName()%>(), getType(), INTERNAL_<%=genFeature.getUpperName()%>, <%if (genFeature.isPrimitiveType()){%> new <%=genFeature.getObjectType()%>(<%}%>new<%=genFeature.getCapName()%><%if (genFeature.isPrimitiveType()){%>)<%}%>);
+ set(get<%=delegateFeature.getAccessorName()%>(), getType(), _INTERNAL_<%=genFeature.getUpperName()%>, <%if (genFeature.isPrimitiveType()){%> new <%=genFeature.getObjectType()%>(<%}%>new<%=genFeature.getCapName()%><%if (genFeature.isPrimitiveType()){%>)<%}%>);
<%} else {%>
((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)get<%=delegateFeature.getAccessorName()%>()).set(<%=genFeature.getQualifiedFeatureAccessor()%>, <%if (genFeature.isPrimitiveType()) {%>new <%=genFeature.getObjectType()%>(<%}%>new<%=genFeature.getCapName()%><%if (genFeature.isPrimitiveType()){%>)<%}%>);
<%}%>
@@ -1047,9 +1047,9 @@
if (isNotifying())
{
<%if (genFeature.isUnsettable()) {%>
- addNotification(this, ChangeKind.UNSET, INTERNAL_<%=genFeature.getUpperName()%>, <%if (genModel.isVirtualDelegation()) {%>isSetChange ? null : old<%=genFeature.getCapName()%><%} else {%>old<%=genFeature.getCapName()%><%}%>, null, <%if (genModel.isVirtualDelegation()) {%>isSetChange<%} else {%>!old<%=genFeature.getCapName()%>_set_<%}%>, changeContext);
+ addNotification(this, ChangeKind.UNSET, _INTERNAL_<%=genFeature.getUpperName()%>, <%if (genModel.isVirtualDelegation()) {%>isSetChange ? null : old<%=genFeature.getCapName()%><%} else {%>old<%=genFeature.getCapName()%><%}%>, null, <%if (genModel.isVirtualDelegation()) {%>isSetChange<%} else {%>!old<%=genFeature.getCapName()%>_set_<%}%>, changeContext);
<%} else {%>
- addNotification(this, ChangeKind.UNSET, INTERNAL_<%=genFeature.getUpperName()%>, <%if (genModel.isVirtualDelegation()) {%>old<%=genFeature.getCapName()%> == EVIRTUAL_NO_VALUE ? null : old<%=genFeature.getCapName()%><%} else {%>old<%=genFeature.getCapName()%><%}%>, null, changeContext);
+ addNotification(this, ChangeKind.UNSET, _INTERNAL_<%=genFeature.getUpperName()%>, <%if (genModel.isVirtualDelegation()) {%>old<%=genFeature.getCapName()%> == EVIRTUAL_NO_VALUE ? null : old<%=genFeature.getCapName()%><%} else {%>old<%=genFeature.getCapName()%><%}%>, null, changeContext);
<%}%>
}
<%}%>
@@ -1112,7 +1112,7 @@
{
ChangeContext changeContext = null;
<%if (!genFeature.isBidirectional()) {%>
- changeContext = inverseRemove(<%=genFeature.getSafeName()%>, this, EOPPOSITE_FEATURE_BASE - INTERNAL_<%=genFeature.getUpperName()%>, null, changeContext);
+ changeContext = inverseRemove(<%=genFeature.getSafeName()%>, this, EOPPOSITE_FEATURE_BASE - _INTERNAL_<%=genFeature.getUpperName()%>, null, changeContext);
<%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass();%>
changeContext = inverseRemove(<%=genFeature.getSafeName()%>, this, <%=SDOGenUtil.getQualifiedInternalPropertyID(reverseFeature)%>, <%=targetClass.getImportedInterfaceName()%>.class, changeContext);
<%}%>
@@ -1136,7 +1136,7 @@
<%}%>
<%if (!genModel.isSuppressNotification()) {%>
if (isNotifying())
- notify(ChangeKind.UNSET, INTERNAL_<%=genFeature.getUpperName()%>, null, null, old<%=genFeature.getCapName()%>_set_);
+ notify(ChangeKind.UNSET, _INTERNAL_<%=genFeature.getUpperName()%>, null, null, old<%=genFeature.getCapName()%>_set_);
<%}%>
}
<%} else {%>
@@ -1171,7 +1171,7 @@
<%}%>
<%if (!genModel.isSuppressNotification()) {%>
if (isNotifying())
- notify(ChangeKind.UNSET, INTERNAL_<%=genFeature.getUpperName()%>, <%if (genModel.isVirtualDelegation()) {%>isSetChange ? old<%=genFeature.getCapName()%> : null<%} else {%>old<%=genFeature.getCapName()%><%}%>, null, <%if (genModel.isVirtualDelegation()) {%>isSetChange<%} else {%>old<%=genFeature.getCapName()%>_set_<%}%>);
+ notify(ChangeKind.UNSET, _INTERNAL_<%=genFeature.getUpperName()%>, <%if (genModel.isVirtualDelegation()) {%>isSetChange ? old<%=genFeature.getCapName()%> : null<%} else {%>old<%=genFeature.getCapName()%><%}%>, null, <%if (genModel.isVirtualDelegation()) {%>isSetChange<%} else {%>old<%=genFeature.getCapName()%>_set_<%}%>);
<%}%>
<%} else {%>
<%if (genClass.isFlag(genFeature)) {%>
@@ -1188,13 +1188,13 @@
<%}%>
<%if (!genModel.isSuppressNotification()) {%>
if (isNotifying())
- notify(ChangeKind.UNSET, INTERNAL_<%=genFeature.getUpperName()%>, <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>isSetChange ? old<%=genFeature.getCapName()%> : <%=genFeature.getUpperName()%>_DEFAULT_<%} else {%>old<%=genFeature.getCapName()%><%}%>, <%=genFeature.getUpperName()%>_DEFAULT_, <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>isSetChange<%} else {%>old<%=genFeature.getCapName()%>_set_<%}%>);
+ notify(ChangeKind.UNSET, _INTERNAL_<%=genFeature.getUpperName()%>, <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>isSetChange ? old<%=genFeature.getCapName()%> : <%=genFeature.getUpperName()%>_DEFAULT_<%} else {%>old<%=genFeature.getCapName()%><%}%>, <%=genFeature.getUpperName()%>_DEFAULT_, <%if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {%>isSetChange<%} else {%>old<%=genFeature.getCapName()%>_set_<%}%>);
<%}%>
<%}%>
<%}%>
<%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature(); //EEEE%>
<%if (delegateFeature.isWrappedFeatureMapType()) {%>
- unset(get<%=delegateFeature.getAccessorName()%>(), getType(), INTERNAL_<%=genFeature.getUpperName()%>);
+ unset(get<%=delegateFeature.getAccessorName()%>(), getType(), _INTERNAL_<%=genFeature.getUpperName()%>);
<%} else {%>
unset<%=genFeature.getImportedType()%>(get<%=delegateFeature.getAccessorName()%>());
<%}%>
@@ -1261,7 +1261,7 @@
<%}%>
<%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature(); //FFFF%>
<%if (delegateFeature.isWrappedFeatureMapType()) {%>
- return isSet(get<%=delegateFeature.getAccessorName()%>(), getType(), INTERNAL_<%=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()%>);
<%}%>
Modified: incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet?rev=615169&r1=615168&r2=615169&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet (original)
+++ incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet Fri Jan 25 02:25:28 2008
@@ -292,7 +292,7 @@
<%if (!genClass.isDynamic()) {%>
<%=genClass.getSafeUncapName()%>Type = createType(false, <%=genPackage.getClassifierID(genClass)%>);
<%for (Iterator j=genClass.getGenFeatures().iterator(); j.hasNext();) { GenFeature genFeature = (GenFeature)j.next();%>
- createProperty(<%=!genFeature.isReferenceType()%>, <%=genClass.getSafeUncapName()%>Type,<%=genClass.getClassName()%>.INTERNAL_<%=genFeature.getUpperName()%>);
+ createProperty(<%=!genFeature.isReferenceType()%>, <%=genClass.getSafeUncapName()%>Type,<%=genClass.getClassName()%>._INTERNAL_<%=genFeature.getUpperName()%>);
<%}%>
<%}%>
<%}%>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org