[87260] Regenerating code based on template changes.
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ConnectorEndImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ConnectorEndImpl.java
index 33a170a..8a68962 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ConnectorEndImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ConnectorEndImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ConnectorEndImpl.java,v 1.10 2005/09/23 21:22:56 khussey Exp $
+ * $Id: ConnectorEndImpl.java,v 1.11 2005/10/05 15:24:17 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -98,7 +98,7 @@
*/
public Property getDefiningEnd() {
Property definingEnd = basicGetDefiningEnd();
- return definingEnd == null ? null : (Property)eResolveProxy((InternalEObject)definingEnd);
+ return definingEnd == null ? null : (definingEnd.eIsProxy() ? (Property)eResolveProxy((InternalEObject)definingEnd) : definingEnd);
}
/**
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ExtensionImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ExtensionImpl.java
index 97c7829..8b97b9a 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ExtensionImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ExtensionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ExtensionImpl.java,v 1.22 2005/10/04 21:55:13 khussey Exp $
+ * $Id: ExtensionImpl.java,v 1.23 2005/10/05 15:24:17 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -108,7 +108,7 @@
*/
public org.eclipse.uml2.Class getMetaclass() {
org.eclipse.uml2.Class metaclass = basicGetMetaclass();
- return metaclass == null ? null : (org.eclipse.uml2.Class)eResolveProxy((InternalEObject)metaclass);
+ return metaclass == null ? null : (metaclass.eIsProxy() ? (org.eclipse.uml2.Class)eResolveProxy((InternalEObject)metaclass) : metaclass);
}
/**
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/OpaqueExpressionImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/OpaqueExpressionImpl.java
index f29521d..f1d5a14 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/OpaqueExpressionImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/OpaqueExpressionImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: OpaqueExpressionImpl.java,v 1.10 2005/09/23 21:22:54 khussey Exp $
+ * $Id: OpaqueExpressionImpl.java,v 1.11 2005/10/05 15:24:16 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -179,7 +179,7 @@
*/
public Parameter getResult() {
Parameter result = basicGetResult();
- return result == null ? null : (Parameter)eResolveProxy((InternalEObject)result);
+ return result == null ? null : (result.eIsProxy() ? (Parameter)eResolveProxy((InternalEObject)result) : result);
}
/**
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/PropertyImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/PropertyImpl.java
index 253a8dc..57a8b22 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/PropertyImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/PropertyImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: PropertyImpl.java,v 1.24 2005/10/04 21:55:12 khussey Exp $
+ * $Id: PropertyImpl.java,v 1.25 2005/10/05 15:24:16 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -611,7 +611,7 @@
*/
public Property getOpposite() {
Property opposite = basicGetOpposite();
- return opposite == null ? null : (Property)eResolveProxy((InternalEObject)opposite);
+ return opposite == null ? null : (opposite.eIsProxy() ? (Property)eResolveProxy((InternalEObject)opposite) : opposite);
}
/**
diff --git a/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/tests/LiteralBooleanTest.java b/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/tests/LiteralBooleanTest.java
index 5ab78c6..85610c6 100644
--- a/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/tests/LiteralBooleanTest.java
+++ b/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/tests/LiteralBooleanTest.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: LiteralBooleanTest.java,v 1.4 2005/06/15 15:58:19 khussey Exp $
+ * $Id: LiteralBooleanTest.java,v 1.5 2005/10/05 15:24:23 khussey Exp $
*/
package org.eclipse.uml2.tests;
@@ -24,8 +24,8 @@
* <p>
* The following operations are tested:
* <ul>
- * <li>{@link org.eclipse.uml2.LiteralBoolean#isComputable() <em>Is Computable</em>}</li>
* <li>{@link org.eclipse.uml2.LiteralBoolean#booleanValue() <em>Boolean Value</em>}</li>
+ * <li>{@link org.eclipse.uml2.LiteralBoolean#isComputable() <em>Is Computable</em>}</li>
* </ul>
* </p>
* @generated
@@ -100,6 +100,7 @@
// Ensure that you remove @generated or mark it @generated NOT
}
+
public void testIsComputable() {
testIsComputableGen();
@@ -118,7 +119,6 @@
// Ensure that you remove @generated or mark it @generated NOT
}
-
public void testBooleanValue() {
testBooleanValueGen();
diff --git a/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/tests/LiteralIntegerTest.java b/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/tests/LiteralIntegerTest.java
index b9034cf..96ccf05 100644
--- a/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/tests/LiteralIntegerTest.java
+++ b/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/tests/LiteralIntegerTest.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: LiteralIntegerTest.java,v 1.3 2005/06/09 02:18:19 khussey Exp $
+ * $Id: LiteralIntegerTest.java,v 1.4 2005/10/05 15:24:23 khussey Exp $
*/
package org.eclipse.uml2.tests;
@@ -24,8 +24,8 @@
* <p>
* The following operations are tested:
* <ul>
- * <li>{@link org.eclipse.uml2.LiteralInteger#isComputable() <em>Is Computable</em>}</li>
* <li>{@link org.eclipse.uml2.LiteralInteger#integerValue() <em>Integer Value</em>}</li>
+ * <li>{@link org.eclipse.uml2.LiteralInteger#isComputable() <em>Is Computable</em>}</li>
* </ul>
* </p>
* @generated
@@ -100,6 +100,7 @@
// Ensure that you remove @generated or mark it @generated NOT
}
+
public void testIsComputable() {
testIsComputableGen();
@@ -118,7 +119,6 @@
// Ensure that you remove @generated or mark it @generated NOT
}
-
public void testIntegerValue() {
testIntegerValueGen();
diff --git a/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/tests/LiteralStringTest.java b/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/tests/LiteralStringTest.java
index fc2a687..27d65d0 100644
--- a/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/tests/LiteralStringTest.java
+++ b/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/tests/LiteralStringTest.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: LiteralStringTest.java,v 1.5 2005/06/15 15:58:19 khussey Exp $
+ * $Id: LiteralStringTest.java,v 1.6 2005/10/05 15:24:23 khussey Exp $
*/
package org.eclipse.uml2.tests;
@@ -24,8 +24,8 @@
* <p>
* The following operations are tested:
* <ul>
- * <li>{@link org.eclipse.uml2.LiteralString#stringValue() <em>String Value</em>}</li>
* <li>{@link org.eclipse.uml2.LiteralString#isComputable() <em>Is Computable</em>}</li>
+ * <li>{@link org.eclipse.uml2.LiteralString#stringValue() <em>String Value</em>}</li>
* </ul>
* </p>
* @generated
@@ -100,7 +100,6 @@
// Ensure that you remove @generated or mark it @generated NOT
}
-
public void testIsComputable() {
testIsComputableGen();
@@ -119,6 +118,7 @@
// Ensure that you remove @generated or mark it @generated NOT
}
+
public void testStringValue() {
testStringValueGen();
