*** empty log message ***
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectContainmentEList.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectContainmentEList.java
index c29b6c2..7d83be0 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectContainmentEList.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectContainmentEList.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: SubsetEObjectContainmentEList.java,v 1.2 2004/04/10 04:09:51 khussey Exp $
+ * $Id: SubsetEObjectContainmentEList.java,v 1.3 2004/06/23 20:34:41 khussey Exp $
*/
package org.eclipse.uml2.internal.util;
@@ -16,7 +16,7 @@
import org.eclipse.emf.ecore.InternalEObject;
/**
- *
+ *
*/
public class SubsetEObjectContainmentEList
extends SubsetEObjectEList {
@@ -33,17 +33,32 @@
public Unsettable(Class dataClass, InternalEObject owner,
int featureID, int supersetFeatureID) {
- this(dataClass, owner, featureID, new int[] {supersetFeatureID});
+ this(dataClass, owner, featureID, new int[]{supersetFeatureID});
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.util.BasicEList#didChange()
+ */
protected void didChange() {
isSet = true;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#isSet()
+ */
public boolean isSet() {
return isSet;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.EStructuralFeature.Setting#unset()
+ */
public void unset() {
super.unset();
@@ -66,17 +81,32 @@
public SubsetEObjectContainmentEList(Class dataClass,
InternalEObject owner, int featureID, int supersetFeatureID) {
- this(dataClass, owner, featureID, new int[] {supersetFeatureID});
+ this(dataClass, owner, featureID, new int[]{supersetFeatureID});
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#hasInverse()
+ */
protected boolean hasInverse() {
return true;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#hasNavigableInverse()
+ */
protected boolean hasNavigableInverse() {
return false;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#isContainment()
+ */
protected boolean isContainment() {
return true;
}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectContainmentWithInverseEList.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectContainmentWithInverseEList.java
index 42fec88..7c4e400 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectContainmentWithInverseEList.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectContainmentWithInverseEList.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: SubsetEObjectContainmentWithInverseEList.java,v 1.2 2004/04/10 04:09:51 khussey Exp $
+ * $Id: SubsetEObjectContainmentWithInverseEList.java,v 1.3 2004/06/23 20:34:41 khussey Exp $
*/
package org.eclipse.uml2.internal.util;
@@ -16,7 +16,7 @@
import org.eclipse.emf.ecore.InternalEObject;
/**
- *
+ *
*/
public class SubsetEObjectContainmentWithInverseEList
extends SubsetEObjectContainmentEList {
@@ -34,18 +34,33 @@
public Unsettable(Class dataClass, InternalEObject owner,
int featureID, int supersetFeatureID, int inverseFeatureID) {
- this(dataClass, owner, featureID, new int[] {supersetFeatureID},
+ this(dataClass, owner, featureID, new int[]{supersetFeatureID},
inverseFeatureID);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.util.BasicEList#didChange()
+ */
protected void didChange() {
isSet = true;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#isSet()
+ */
public boolean isSet() {
return isSet;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.EStructuralFeature.Setting#unset()
+ */
public void unset() {
super.unset();
@@ -74,18 +89,33 @@
public SubsetEObjectContainmentWithInverseEList(Class dataClass,
InternalEObject owner, int featureID, int supersetFeatureID,
int inverseFeatureID) {
- this(dataClass, owner, featureID, new int[] {supersetFeatureID},
+ this(dataClass, owner, featureID, new int[]{supersetFeatureID},
inverseFeatureID);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#hasNavigableInverse()
+ */
protected boolean hasNavigableInverse() {
return true;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#getInverseFeatureID()
+ */
public int getInverseFeatureID() {
return inverseFeatureID;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#getInverseFeatureClass()
+ */
public Class getInverseFeatureClass() {
return dataClass;
}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectEList.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectEList.java
index 73f64ef..efcc848 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectEList.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectEList.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: SubsetEObjectEList.java,v 1.2 2004/04/10 04:09:51 khussey Exp $
+ * $Id: SubsetEObjectEList.java,v 1.3 2004/06/23 20:34:41 khussey Exp $
*/
package org.eclipse.uml2.internal.util;
@@ -23,7 +23,7 @@
import org.eclipse.emf.ecore.util.EObjectEList;
/**
- *
+ *
*/
public class SubsetEObjectEList
extends EObjectEList {
@@ -40,17 +40,32 @@
public Unsettable(Class dataClass, InternalEObject owner,
int featureID, int supersetFeatureID) {
- this(dataClass, owner, featureID, new int[] {supersetFeatureID});
+ this(dataClass, owner, featureID, new int[]{supersetFeatureID});
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.util.BasicEList#didChange()
+ */
protected void didChange() {
isSet = true;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#isSet()
+ */
public boolean isSet() {
return isSet;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.EStructuralFeature.Setting#unset()
+ */
public void unset() {
super.unset();
@@ -77,7 +92,7 @@
public SubsetEObjectEList(Class dataClass, InternalEObject owner,
int featureID, int supersetFeatureID) {
- this(dataClass, owner, featureID, new int[] {supersetFeatureID});
+ this(dataClass, owner, featureID, new int[]{supersetFeatureID});
}
protected void supersetAdd(Object object) {
@@ -97,8 +112,11 @@
}
}
- /**
- * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#basicAdd(java.lang.Object, org.eclipse.emf.common.notify.NotificationChain)
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#basicAdd(java.lang.Object,
+ * org.eclipse.emf.common.notify.NotificationChain)
*/
public NotificationChain basicAdd(Object object,
NotificationChain notifications) {
@@ -109,8 +127,11 @@
return notifications;
}
- /**
- * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#basicSet(int, java.lang.Object, org.eclipse.emf.common.notify.NotificationChain)
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#basicSet(int,
+ * java.lang.Object, org.eclipse.emf.common.notify.NotificationChain)
*/
public NotificationChain basicSet(int index, Object object,
NotificationChain notifications) {
@@ -121,7 +142,9 @@
return notifications;
}
- /**
+ /*
+ * (non-Javadoc)
+ *
* @see java.util.List#add(int, java.lang.Object)
*/
public void add(int index, Object object) {
@@ -130,7 +153,9 @@
supersetAdd(object);
}
- /**
+ /*
+ * (non-Javadoc)
+ *
* @see java.util.Collection#add(java.lang.Object)
*/
public boolean add(Object object) {
@@ -141,7 +166,9 @@
return result;
}
- /**
+ /*
+ * (non-Javadoc)
+ *
* @see java.util.Collection#addAll(java.util.Collection)
*/
public boolean addAll(Collection collection) {
@@ -154,7 +181,9 @@
return result;
}
- /**
+ /*
+ * (non-Javadoc)
+ *
* @see java.util.List#addAll(int, java.util.Collection)
*/
public boolean addAll(int index, Collection collection) {
@@ -167,7 +196,9 @@
return result;
}
- /**
+ /*
+ * (non-Javadoc)
+ *
* @see java.util.List#set(int, java.lang.Object)
*/
public Object set(int index, Object object) {
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectResolvingEList.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectResolvingEList.java
index 80a16de..26d19f7 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectResolvingEList.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectResolvingEList.java
@@ -8,16 +8,15 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: SubsetEObjectResolvingEList.java,v 1.2 2004/04/10 04:09:51 khussey Exp $
+ * $Id: SubsetEObjectResolvingEList.java,v 1.3 2004/06/23 20:34:41 khussey Exp $
*/
package org.eclipse.uml2.internal.util;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.InternalEObject;
/**
- *
+ *
*/
public class SubsetEObjectResolvingEList
extends SubsetEObjectEList {
@@ -34,17 +33,32 @@
public Unsettable(Class dataClass, InternalEObject owner,
int featureID, int supersetFeatureID) {
- this(dataClass, owner, featureID, new int[] {supersetFeatureID});
+ this(dataClass, owner, featureID, new int[]{supersetFeatureID});
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.util.BasicEList#didChange()
+ */
protected void didChange() {
isSet = true;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#isSet()
+ */
public boolean isSet() {
return isSet;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.EStructuralFeature.Setting#unset()
+ */
public void unset() {
super.unset();
@@ -67,23 +81,16 @@
public SubsetEObjectResolvingEList(Class dataClass, InternalEObject owner,
int featureID, int supersetFeatureID) {
- this(dataClass, owner, featureID, new int[] {supersetFeatureID});
+ this(dataClass, owner, featureID, new int[]{supersetFeatureID});
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#hasProxies()
+ */
protected boolean hasProxies() {
return true;
}
- protected Object resolve(Object object) {
- return object instanceof EObject && ((EObject) object).eIsProxy()
- ? resolveProxy((EObject) object) : object;
- }
-
- /**
- * @see org.eclipse.uml2.internal.util.SubsetEObjectEList#supersetAdd(java.lang.Object)
- */
- protected void supersetAdd(Object object) {
- super.supersetAdd(resolve(object));
- }
-
}
\ No newline at end of file
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectWithInverseEList.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectWithInverseEList.java
index def0063..0c7119b 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectWithInverseEList.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectWithInverseEList.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: SubsetEObjectWithInverseEList.java,v 1.2 2004/04/10 04:09:51 khussey Exp $
+ * $Id: SubsetEObjectWithInverseEList.java,v 1.3 2004/06/23 20:34:41 khussey Exp $
*/
package org.eclipse.uml2.internal.util;
@@ -16,7 +16,7 @@
import org.eclipse.emf.ecore.InternalEObject;
/**
- *
+ *
*/
public class SubsetEObjectWithInverseEList
extends SubsetEObjectEList {
@@ -36,10 +36,15 @@
public ManyInverse(Class dataClass, InternalEObject owner,
int featureID, int supersetFeatureID, int inverseFeatureID) {
- this(dataClass, owner, featureID,
- new int[] {supersetFeatureID}, inverseFeatureID);
+ this(dataClass, owner, featureID, new int[]{supersetFeatureID},
+ inverseFeatureID);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#hasManyInverse()
+ */
protected boolean hasManyInverse() {
return true;
}
@@ -55,18 +60,33 @@
public Unsettable(Class dataClass, InternalEObject owner,
int featureID, int supersetFeatureID, int inverseFeatureID) {
- this(dataClass, owner, featureID, new int[] {supersetFeatureID},
+ this(dataClass, owner, featureID, new int[]{supersetFeatureID},
inverseFeatureID);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.util.BasicEList#didChange()
+ */
protected void didChange() {
isSet = true;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#isSet()
+ */
public boolean isSet() {
return isSet;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.EStructuralFeature.Setting#unset()
+ */
public void unset() {
super.unset();
@@ -93,10 +113,15 @@
public ManyInverse(Class dataClass, InternalEObject owner,
int featureID, int supersetFeatureID, int inverseFeatureID) {
- this(dataClass, owner, featureID, new int[] {supersetFeatureID},
+ this(dataClass, owner, featureID, new int[]{supersetFeatureID},
inverseFeatureID);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#hasManyInverse()
+ */
protected boolean hasManyInverse() {
return true;
}
@@ -115,22 +140,42 @@
public SubsetEObjectWithInverseEList(Class dataClass,
InternalEObject owner, int featureID, int supersetFeatureID,
int inverseFeatureID) {
- this(dataClass, owner, featureID, new int[] {supersetFeatureID},
+ this(dataClass, owner, featureID, new int[]{supersetFeatureID},
inverseFeatureID);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#hasInverse()
+ */
protected boolean hasInverse() {
return true;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#hasNavigableInverse()
+ */
protected boolean hasNavigableInverse() {
return true;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#getInverseFeatureID()
+ */
public int getInverseFeatureID() {
return inverseFeatureID;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#getInverseFeatureClass()
+ */
public Class getInverseFeatureClass() {
return dataClass;
}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectWithInverseResolvingEList.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectWithInverseResolvingEList.java
index d6e41bd..571a855 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectWithInverseResolvingEList.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SubsetEObjectWithInverseResolvingEList.java
@@ -8,16 +8,15 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: SubsetEObjectWithInverseResolvingEList.java,v 1.2 2004/04/10 04:09:51 khussey Exp $
+ * $Id: SubsetEObjectWithInverseResolvingEList.java,v 1.3 2004/06/23 20:34:41 khussey Exp $
*/
package org.eclipse.uml2.internal.util;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.InternalEObject;
/**
- *
+ *
*/
public class SubsetEObjectWithInverseResolvingEList
extends SubsetEObjectWithInverseEList {
@@ -37,10 +36,15 @@
public ManyInverse(Class dataClass, InternalEObject owner,
int featureID, int supersetFeatureID, int inverseFeatureID) {
- this(dataClass, owner, featureID,
- new int[] {supersetFeatureID}, inverseFeatureID);
+ this(dataClass, owner, featureID, new int[]{supersetFeatureID},
+ inverseFeatureID);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#hasManyInverse()
+ */
protected boolean hasManyInverse() {
return true;
}
@@ -56,18 +60,33 @@
public Unsettable(Class dataClass, InternalEObject owner,
int featureID, int supersetFeatureID, int inverseFeatureID) {
- this(dataClass, owner, featureID, new int[] {supersetFeatureID},
+ this(dataClass, owner, featureID, new int[]{supersetFeatureID},
inverseFeatureID);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.util.BasicEList#didChange()
+ */
protected void didChange() {
isSet = true;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#isSet()
+ */
public boolean isSet() {
return isSet;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.EStructuralFeature.Setting#unset()
+ */
public void unset() {
super.unset();
@@ -94,12 +113,16 @@
public ManyInverse(Class dataClass, InternalEObject owner,
int featureID, int supersetFeatureID, int inverseFeatureID) {
- this(dataClass, owner, featureID, new int[] {supersetFeatureID},
+ this(dataClass, owner, featureID, new int[]{supersetFeatureID},
inverseFeatureID);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#hasManyInverse()
+ */
protected boolean hasManyInverse() {
-
return true;
}
}
@@ -113,24 +136,16 @@
public SubsetEObjectWithInverseResolvingEList(Class dataClass,
InternalEObject owner, int featureID, int supersetFeatureID,
int inverseFeatureID) {
- this(dataClass, owner, featureID, new int[] {supersetFeatureID},
+ this(dataClass, owner, featureID, new int[]{supersetFeatureID},
inverseFeatureID);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#hasProxies()
+ */
protected boolean hasProxies() {
return true;
}
-
- protected Object resolve(Object object) {
- return object instanceof EObject && ((EObject) object).eIsProxy()
- ? resolveProxy((EObject) object) : object;
- }
-
- /**
- * @see org.eclipse.uml2.internal.util.SubsetEObjectEList#supersetAdd(java.lang.Object)
- */
- protected void supersetAdd(Object object) {
- super.supersetAdd(resolve(object));
- }
-
}
\ No newline at end of file
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectContainmentEList.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectContainmentEList.java
index 21650b1..5c25a2b 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectContainmentEList.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectContainmentEList.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: SupersetEObjectContainmentEList.java,v 1.2 2004/04/10 04:09:51 khussey Exp $
+ * $Id: SupersetEObjectContainmentEList.java,v 1.3 2004/06/23 20:34:41 khussey Exp $
*/
package org.eclipse.uml2.internal.util;
@@ -16,7 +16,7 @@
import org.eclipse.emf.ecore.InternalEObject;
/**
- *
+ *
*/
public class SupersetEObjectContainmentEList
extends SupersetEObjectEList {
@@ -33,17 +33,32 @@
public Unsettable(Class dataClass, InternalEObject owner,
int featureID, int subsetFeatureID) {
- this(dataClass, owner, featureID, new int[] {subsetFeatureID});
+ this(dataClass, owner, featureID, new int[]{subsetFeatureID});
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.util.BasicEList#didChange()
+ */
protected void didChange() {
isSet = true;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#isSet()
+ */
public boolean isSet() {
return isSet;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.EStructuralFeature.Setting#unset()
+ */
public void unset() {
super.unset();
@@ -66,17 +81,32 @@
public SupersetEObjectContainmentEList(Class dataClass,
InternalEObject owner, int featureID, int subsetFeatureID) {
- this(dataClass, owner, featureID, new int[] {subsetFeatureID});
+ this(dataClass, owner, featureID, new int[]{subsetFeatureID});
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#hasInverse()
+ */
protected boolean hasInverse() {
return true;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#hasNavigableInverse()
+ */
protected boolean hasNavigableInverse() {
return false;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#isContainment()
+ */
protected boolean isContainment() {
return true;
}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectContainmentWithInverseEList.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectContainmentWithInverseEList.java
index 3c1eae1..4f0a66f 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectContainmentWithInverseEList.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectContainmentWithInverseEList.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: SupersetEObjectContainmentWithInverseEList.java,v 1.2 2004/04/10 04:09:51 khussey Exp $
+ * $Id: SupersetEObjectContainmentWithInverseEList.java,v 1.3 2004/06/23 20:34:41 khussey Exp $
*/
package org.eclipse.uml2.internal.util;
@@ -16,7 +16,7 @@
import org.eclipse.emf.ecore.InternalEObject;
/**
- *
+ *
*/
public class SupersetEObjectContainmentWithInverseEList
extends SupersetEObjectContainmentEList {
@@ -34,18 +34,33 @@
public Unsettable(Class dataClass, InternalEObject owner,
int featureID, int subsetFeatureID, int inverseFeatureID) {
- this(dataClass, owner, featureID, new int[] {subsetFeatureID},
+ this(dataClass, owner, featureID, new int[]{subsetFeatureID},
inverseFeatureID);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.util.BasicEList#didChange()
+ */
protected void didChange() {
isSet = true;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#isSet()
+ */
public boolean isSet() {
return isSet;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.EStructuralFeature.Setting#unset()
+ */
public void unset() {
super.unset();
@@ -74,18 +89,33 @@
public SupersetEObjectContainmentWithInverseEList(Class dataClass,
InternalEObject owner, int featureID, int subsetFeatureID,
int inverseFeatureID) {
- this(dataClass, owner, featureID, new int[] {subsetFeatureID},
+ this(dataClass, owner, featureID, new int[]{subsetFeatureID},
inverseFeatureID);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#hasNavigableInverse()
+ */
protected boolean hasNavigableInverse() {
return true;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#getInverseFeatureID()
+ */
public int getInverseFeatureID() {
return inverseFeatureID;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#getInverseFeatureClass()
+ */
public Class getInverseFeatureClass() {
return dataClass;
}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectEList.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectEList.java
index 8f11bcf..9a48129 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectEList.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectEList.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: SupersetEObjectEList.java,v 1.2 2004/04/10 04:09:51 khussey Exp $
+ * $Id: SupersetEObjectEList.java,v 1.3 2004/06/23 20:34:41 khussey Exp $
*/
package org.eclipse.uml2.internal.util;
@@ -19,7 +19,7 @@
import org.eclipse.emf.ecore.util.EObjectEList;
/**
- *
+ *
*/
public class SupersetEObjectEList
extends EObjectEList {
@@ -36,17 +36,32 @@
public Unsettable(Class dataClass, InternalEObject owner,
int featureID, int subsetFeatureID) {
- this(dataClass, owner, featureID, new int[] {subsetFeatureID});
+ this(dataClass, owner, featureID, new int[]{subsetFeatureID});
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.util.BasicEList#didChange()
+ */
protected void didChange() {
isSet = true;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#isSet()
+ */
public boolean isSet() {
return isSet;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.EStructuralFeature.Setting#unset()
+ */
public void unset() {
super.unset();
@@ -73,7 +88,7 @@
public SupersetEObjectEList(Class dataClass, InternalEObject owner,
int featureID, int subsetFeatureID) {
- this(dataClass, owner, featureID, new int[] {subsetFeatureID});
+ this(dataClass, owner, featureID, new int[]{subsetFeatureID});
}
protected void subsetRemove(Object object) {
@@ -83,12 +98,7 @@
.getEStructuralFeature(subsetFeatureIDs[i]);
if (subsetEStructuralFeature.isMany()) {
- EList subsetEList = (EList) owner
- .eGet(subsetEStructuralFeature);
-
- if (subsetEList.contains(object)) {
- subsetEList.remove(object);
- }
+ ((EList) owner.eGet(subsetEStructuralFeature)).remove(object);
} else {
if (object.equals(owner.eGet(subsetEStructuralFeature))) {
@@ -98,12 +108,24 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.util.BasicEList#didRemove(int,
+ * java.lang.Object)
+ */
protected void didRemove(int index, Object oldObject) {
super.didRemove(index, oldObject);
subsetRemove(oldObject);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.util.BasicEList#didSet(int, java.lang.Object,
+ * java.lang.Object)
+ */
protected void didSet(int index, Object newObject, Object oldObject) {
super.didSet(index, newObject, oldObject);
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectResolvingEList.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectResolvingEList.java
index 63a2b00..ae5d976 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectResolvingEList.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectResolvingEList.java
@@ -8,16 +8,15 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: SupersetEObjectResolvingEList.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: SupersetEObjectResolvingEList.java,v 1.3 2004/06/23 20:34:41 khussey Exp $
*/
package org.eclipse.uml2.internal.util;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.InternalEObject;
/**
- *
+ *
*/
public class SupersetEObjectResolvingEList
extends SupersetEObjectEList {
@@ -34,17 +33,32 @@
public Unsettable(Class dataClass, InternalEObject owner,
int featureID, int subsetFeatureID) {
- this(dataClass, owner, featureID, new int[] {subsetFeatureID});
+ this(dataClass, owner, featureID, new int[]{subsetFeatureID});
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.util.BasicEList#didChange()
+ */
protected void didChange() {
isSet = true;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#isSet()
+ */
public boolean isSet() {
return isSet;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.EStructuralFeature.Setting#unset()
+ */
public void unset() {
super.unset();
@@ -67,23 +81,16 @@
public SupersetEObjectResolvingEList(Class dataClass,
InternalEObject owner, int featureID, int subsetFeatureID) {
- this(dataClass, owner, featureID, new int[] {subsetFeatureID});
+ this(dataClass, owner, featureID, new int[]{subsetFeatureID});
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#hasProxies()
+ */
protected boolean hasProxies() {
return true;
}
- protected Object resolve(Object object) {
- return object instanceof EObject && ((EObject) object).eIsProxy()
- ? resolveProxy((EObject) object) : object;
- }
-
- /**
- * @see org.eclipse.uml2.internal.util.SupersetEObjectEList#subsetRemove(java.lang.Object)
- */
- protected void subsetRemove(Object object) {
- super.subsetRemove(resolve(object));
- }
-
}
\ No newline at end of file
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectWithInverseEList.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectWithInverseEList.java
index 2cd125d..f0b94f5 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectWithInverseEList.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectWithInverseEList.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: SupersetEObjectWithInverseEList.java,v 1.2 2004/04/10 04:09:51 khussey Exp $
+ * $Id: SupersetEObjectWithInverseEList.java,v 1.3 2004/06/23 20:34:41 khussey Exp $
*/
package org.eclipse.uml2.internal.util;
@@ -16,7 +16,7 @@
import org.eclipse.emf.ecore.InternalEObject;
/**
- *
+ *
*/
public class SupersetEObjectWithInverseEList
extends SupersetEObjectEList {
@@ -35,10 +35,15 @@
public ManyInverse(Class dataClass, InternalEObject owner,
int featureID, int subsetFeatureID, int inverseFeatureID) {
- this(dataClass, owner, featureID, new int[] {subsetFeatureID},
+ this(dataClass, owner, featureID, new int[]{subsetFeatureID},
inverseFeatureID);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#hasManyInverse()
+ */
protected boolean hasManyInverse() {
return true;
}
@@ -54,18 +59,33 @@
public Unsettable(Class dataClass, InternalEObject owner,
int featureID, int subsetFeatureID, int inverseFeatureID) {
- this(dataClass, owner, featureID, new int[] {subsetFeatureID},
+ this(dataClass, owner, featureID, new int[]{subsetFeatureID},
inverseFeatureID);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.util.BasicEList#didChange()
+ */
protected void didChange() {
isSet = true;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#isSet()
+ */
public boolean isSet() {
return isSet;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.EStructuralFeature.Setting#unset()
+ */
public void unset() {
super.unset();
@@ -92,10 +112,15 @@
public ManyInverse(Class dataClass, InternalEObject owner,
int featureID, int subsetFeatureID, int inverseFeatureID) {
- this(dataClass, owner, featureID, new int[] {subsetFeatureID},
+ this(dataClass, owner, featureID, new int[]{subsetFeatureID},
inverseFeatureID);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#hasManyInverse()
+ */
protected boolean hasManyInverse() {
return true;
}
@@ -114,22 +139,42 @@
public SupersetEObjectWithInverseEList(Class dataClass,
InternalEObject owner, int featureID, int subsetFeatureID,
int inverseFeatureID) {
- this(dataClass, owner, featureID, new int[] {subsetFeatureID},
+ this(dataClass, owner, featureID, new int[]{subsetFeatureID},
inverseFeatureID);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#hasInverse()
+ */
protected boolean hasInverse() {
return true;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#hasNavigableInverse()
+ */
protected boolean hasNavigableInverse() {
return true;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#getInverseFeatureID()
+ */
public int getInverseFeatureID() {
return inverseFeatureID;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#getInverseFeatureClass()
+ */
public Class getInverseFeatureClass() {
return dataClass;
}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectWithInverseResolvingEList.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectWithInverseResolvingEList.java
index 833c4ca..b436095 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectWithInverseResolvingEList.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/SupersetEObjectWithInverseResolvingEList.java
@@ -8,12 +8,11 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: SupersetEObjectWithInverseResolvingEList.java,v 1.2 2004/04/10 04:09:51 khussey Exp $
+ * $Id: SupersetEObjectWithInverseResolvingEList.java,v 1.3 2004/06/23 20:34:41 khussey Exp $
*/
package org.eclipse.uml2.internal.util;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.InternalEObject;
/**
@@ -36,10 +35,15 @@
public ManyInverse(Class dataClass, InternalEObject owner,
int featureID, int subsetFeatureID, int inverseFeatureID) {
- this(dataClass, owner, featureID, new int[] {subsetFeatureID},
+ this(dataClass, owner, featureID, new int[]{subsetFeatureID},
inverseFeatureID);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#hasManyInverse()
+ */
protected boolean hasManyInverse() {
return true;
}
@@ -55,18 +59,33 @@
public Unsettable(Class dataClass, InternalEObject owner,
int featureID, int subsetFeatureID, int inverseFeatureID) {
- this(dataClass, owner, featureID, new int[] {subsetFeatureID},
+ this(dataClass, owner, featureID, new int[]{subsetFeatureID},
inverseFeatureID);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.util.BasicEList#didChange()
+ */
protected void didChange() {
isSet = true;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.common.notify.impl.NotifyingListImpl#isSet()
+ */
public boolean isSet() {
return isSet;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.EStructuralFeature.Setting#unset()
+ */
public void unset() {
super.unset();
@@ -93,10 +112,15 @@
public ManyInverse(Class dataClass, InternalEObject owner,
int featureID, int subsetFeatureID, int inverseFeatureID) {
- this(dataClass, owner, featureID, new int[] {subsetFeatureID},
+ this(dataClass, owner, featureID, new int[]{subsetFeatureID},
inverseFeatureID);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#hasManyInverse()
+ */
protected boolean hasManyInverse() {
return true;
}
@@ -111,24 +135,17 @@
public SupersetEObjectWithInverseResolvingEList(Class dataClass,
InternalEObject owner, int featureID, int subsetFeatureID,
int inverseFeatureID) {
- this(dataClass, owner, featureID, new int[] {subsetFeatureID},
+ this(dataClass, owner, featureID, new int[]{subsetFeatureID},
inverseFeatureID);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.EcoreEList#hasProxies()
+ */
protected boolean hasProxies() {
return true;
}
- protected Object resolve(Object object) {
- return object instanceof EObject && ((EObject) object).eIsProxy()
- ? resolveProxy((EObject) object) : object;
- }
-
- /**
- * @see org.eclipse.uml2.internal.util.SupersetEObjectEList#subsetRemove(java.lang.Object)
- */
- protected void subsetRemove(Object object) {
- super.subsetRemove(resolve(object));
- }
-
}
\ No newline at end of file
