*** empty log message ***
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/BehavioralFeatureImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/BehavioralFeatureImpl.java
index 17f110f..bdc1930 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/BehavioralFeatureImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/BehavioralFeatureImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: BehavioralFeatureImpl.java,v 1.7 2004/06/02 05:02:25 khussey Exp $
+ * $Id: BehavioralFeatureImpl.java,v 1.8 2004/06/17 03:20:09 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -242,12 +242,29 @@
* <!-- end-user-doc -->
* @generated
*/
+ public EList getRedefinitionContextsGen() {
+ EList redefinitionContext = (EList) getCacheAdapter().get(this, UML2Package.eINSTANCE.getRedefinableElement_RedefinitionContext());
+
+ if (null == redefinitionContext) {
+ Set union = new LinkedHashSet();
+
+ redefinitionContext = new EcoreEList.UnmodifiableEList(this, UML2Package.eINSTANCE.getRedefinableElement_RedefinitionContext(), union.size(), union.toArray());
+ getCacheAdapter().put(this, UML2Package.eINSTANCE.getRedefinableElement_RedefinitionContext(), redefinitionContext);
+ }
+
+ return redefinitionContext;
+ }
+
public EList getRedefinitionContexts() {
EList redefinitionContext = (EList) getCacheAdapter().get(this, UML2Package.eINSTANCE.getRedefinableElement_RedefinitionContext());
if (null == redefinitionContext) {
Set union = new LinkedHashSet();
+ if (Classifier.class.isInstance(eContainer)) {
+ union.add(eContainer);
+ }
+
redefinitionContext = new EcoreEList.UnmodifiableEList(this, UML2Package.eINSTANCE.getRedefinableElement_RedefinitionContext(), union.size(), union.toArray());
getCacheAdapter().put(this, UML2Package.eINSTANCE.getRedefinableElement_RedefinitionContext(), redefinitionContext);
}
@@ -298,12 +315,29 @@
* <!-- end-user-doc -->
* @generated
*/
+ public EList getFeaturingClassifiersGen() {
+ EList featuringClassifier = (EList) getCacheAdapter().get(this, UML2Package.eINSTANCE.getFeature_FeaturingClassifier());
+
+ if (null == featuringClassifier) {
+ Set union = new LinkedHashSet();
+
+ featuringClassifier = new EcoreEList.UnmodifiableEList(this, UML2Package.eINSTANCE.getFeature_FeaturingClassifier(), union.size(), union.toArray());
+ getCacheAdapter().put(this, UML2Package.eINSTANCE.getFeature_FeaturingClassifier(), featuringClassifier);
+ }
+
+ return featuringClassifier;
+ }
+
public EList getFeaturingClassifiers() {
EList featuringClassifier = (EList) getCacheAdapter().get(this, UML2Package.eINSTANCE.getFeature_FeaturingClassifier());
if (null == featuringClassifier) {
Set union = new LinkedHashSet();
+ if (Classifier.class.isInstance(eContainer)) {
+ union.add(eContainer);
+ }
+
featuringClassifier = new EcoreEList.UnmodifiableEList(this, UML2Package.eINSTANCE.getFeature_FeaturingClassifier(), union.size(), union.toArray());
getCacheAdapter().put(this, UML2Package.eINSTANCE.getFeature_FeaturingClassifier(), featuringClassifier);
}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ClassifierImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ClassifierImpl.java
index ffcfc8d..74ed49e 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ClassifierImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ClassifierImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: ClassifierImpl.java,v 1.16 2004/06/15 21:01:02 khussey Exp $
+ * $Id: ClassifierImpl.java,v 1.17 2004/06/17 03:20:09 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -459,12 +459,29 @@
* <!-- end-user-doc -->
* @generated
*/
+ public EList getRedefinitionContextsGen() {
+ EList redefinitionContext = (EList) getCacheAdapter().get(this, UML2Package.eINSTANCE.getRedefinableElement_RedefinitionContext());
+
+ if (null == redefinitionContext) {
+ Set union = new LinkedHashSet();
+
+ redefinitionContext = new EcoreEList.UnmodifiableEList(this, UML2Package.eINSTANCE.getRedefinableElement_RedefinitionContext(), union.size(), union.toArray());
+ getCacheAdapter().put(this, UML2Package.eINSTANCE.getRedefinableElement_RedefinitionContext(), redefinitionContext);
+ }
+
+ return redefinitionContext;
+ }
+
public EList getRedefinitionContexts() {
EList redefinitionContext = (EList) getCacheAdapter().get(this, UML2Package.eINSTANCE.getRedefinableElement_RedefinitionContext());
if (null == redefinitionContext) {
Set union = new LinkedHashSet();
+ if (Classifier.class.isInstance(eContainer)) {
+ union.add(eContainer);
+ }
+
redefinitionContext = new EcoreEList.UnmodifiableEList(this, UML2Package.eINSTANCE.getRedefinableElement_RedefinitionContext(), union.size(), union.toArray());
getCacheAdapter().put(this, UML2Package.eINSTANCE.getRedefinableElement_RedefinitionContext(), redefinitionContext);
}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/FeatureImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/FeatureImpl.java
index 417ea15..3402b20 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/FeatureImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/FeatureImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: FeatureImpl.java,v 1.4 2004/06/02 05:02:26 khussey Exp $
+ * $Id: FeatureImpl.java,v 1.5 2004/06/17 03:20:09 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -119,12 +119,29 @@
* <!-- end-user-doc -->
* @generated
*/
+ public EList getFeaturingClassifiersGen() {
+ EList featuringClassifier = (EList) getCacheAdapter().get(this, UML2Package.eINSTANCE.getFeature_FeaturingClassifier());
+
+ if (null == featuringClassifier) {
+ Set union = new LinkedHashSet();
+
+ featuringClassifier = new EcoreEList.UnmodifiableEList(this, UML2Package.eINSTANCE.getFeature_FeaturingClassifier(), union.size(), union.toArray());
+ getCacheAdapter().put(this, UML2Package.eINSTANCE.getFeature_FeaturingClassifier(), featuringClassifier);
+ }
+
+ return featuringClassifier;
+ }
+
public EList getFeaturingClassifiers() {
EList featuringClassifier = (EList) getCacheAdapter().get(this, UML2Package.eINSTANCE.getFeature_FeaturingClassifier());
if (null == featuringClassifier) {
Set union = new LinkedHashSet();
+ if (Classifier.class.isInstance(eContainer)) {
+ union.add(eContainer);
+ }
+
featuringClassifier = new EcoreEList.UnmodifiableEList(this, UML2Package.eINSTANCE.getFeature_FeaturingClassifier(), union.size(), union.toArray());
getCacheAdapter().put(this, UML2Package.eINSTANCE.getFeature_FeaturingClassifier(), featuringClassifier);
}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/RedefinableElementImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/RedefinableElementImpl.java
index d56ec06..148423a 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/RedefinableElementImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/RedefinableElementImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: RedefinableElementImpl.java,v 1.6 2004/06/02 05:02:25 khussey Exp $
+ * $Id: RedefinableElementImpl.java,v 1.7 2004/06/17 03:20:09 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -140,12 +140,29 @@
* <!-- end-user-doc -->
* @generated
*/
+ public EList getRedefinitionContextsGen() {
+ EList redefinitionContext = (EList) getCacheAdapter().get(this, UML2Package.eINSTANCE.getRedefinableElement_RedefinitionContext());
+
+ if (null == redefinitionContext) {
+ Set union = new LinkedHashSet();
+
+ redefinitionContext = new EcoreEList.UnmodifiableEList(this, UML2Package.eINSTANCE.getRedefinableElement_RedefinitionContext(), union.size(), union.toArray());
+ getCacheAdapter().put(this, UML2Package.eINSTANCE.getRedefinableElement_RedefinitionContext(), redefinitionContext);
+ }
+
+ return redefinitionContext;
+ }
+
public EList getRedefinitionContexts() {
EList redefinitionContext = (EList) getCacheAdapter().get(this, UML2Package.eINSTANCE.getRedefinableElement_RedefinitionContext());
if (null == redefinitionContext) {
Set union = new LinkedHashSet();
+ if (Classifier.class.isInstance(eContainer)) {
+ union.add(eContainer);
+ }
+
redefinitionContext = new EcoreEList.UnmodifiableEList(this, UML2Package.eINSTANCE.getRedefinableElement_RedefinitionContext(), union.size(), union.toArray());
getCacheAdapter().put(this, UML2Package.eINSTANCE.getRedefinableElement_RedefinitionContext(), redefinitionContext);
}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/PropertyOperations.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/PropertyOperations.java
index 10b12ba..a3079bb 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/PropertyOperations.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/PropertyOperations.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: PropertyOperations.java,v 1.7 2004/05/11 15:24:01 khussey Exp $
+ * $Id: PropertyOperations.java,v 1.8 2004/06/17 03:20:09 khussey Exp $
*/
package org.eclipse.uml2.internal.operation;
@@ -31,9 +31,9 @@
import org.eclipse.uml2.Property;
import org.eclipse.uml2.RedefinableElement;
import org.eclipse.uml2.Type;
-import org.eclipse.uml2.util.UML2Validator;
import org.eclipse.uml2.UML2Package;
import org.eclipse.uml2.UML2Plugin;
+import org.eclipse.uml2.util.UML2Validator;
/**
* A static utility class that provides operations related to properties.
@@ -73,13 +73,15 @@
Property prop = (Property) redefinee;
return (null == property.getType()
- ? null == prop.getType() : property.getType().conformsTo(
- prop.getType()))
- && property.lowerBound() >= prop.lowerBound()
- && (MultiplicityElement.UNLIMITED_UPPER_BOUND == prop
- .upperBound() || (property.upperBound() != MultiplicityElement.UNLIMITED_UPPER_BOUND && property
- .upperBound() <= prop.upperBound())) && (prop.isDerived()
- ? property.isDerived() : true);
+ ? null == prop.getType()
+ : prop.getType().conformsTo(property.getType()))
+ && prop.lowerBound() >= property.lowerBound()
+ && (MultiplicityElement.UNLIMITED_UPPER_BOUND == property
+ .upperBound() || (prop.upperBound() != MultiplicityElement.UNLIMITED_UPPER_BOUND && prop
+ .upperBound() <= property.upperBound()))
+ && (property.isDerived()
+ ? prop.isDerived()
+ : true);
}
return false;
@@ -191,9 +193,9 @@
((LiteralBoolean) (LiteralBoolean.class.isInstance(property
.getDefaultValue())
- ? property.getDefaultValue() : property
- .createDefaultValue(UML2Package.eINSTANCE.getLiteralBoolean())))
- .setValue(value);
+ ? property.getDefaultValue()
+ : property.createDefaultValue(UML2Package.eINSTANCE
+ .getLiteralBoolean()))).setValue(value);
}
/**
@@ -213,9 +215,9 @@
((LiteralInteger) (LiteralInteger.class.isInstance(property
.getDefaultValue())
- ? property.getDefaultValue() : property
- .createDefaultValue(UML2Package.eINSTANCE.getLiteralInteger())))
- .setValue(value);
+ ? property.getDefaultValue()
+ : property.createDefaultValue(UML2Package.eINSTANCE
+ .getLiteralInteger()))).setValue(value);
}
/**
@@ -234,9 +236,9 @@
((LiteralString) (LiteralString.class.isInstance(property
.getDefaultValue())
- ? property.getDefaultValue() : property
- .createDefaultValue(UML2Package.eINSTANCE.getLiteralString())))
- .setValue(value);
+ ? property.getDefaultValue()
+ : property.createDefaultValue(UML2Package.eINSTANCE
+ .getLiteralString()))).setValue(value);
}
/**
@@ -256,14 +258,15 @@
((LiteralUnlimitedNatural) (LiteralUnlimitedNatural.class
.isInstance(property.getDefaultValue())
- ? property.getDefaultValue() : property
- .createDefaultValue(UML2Package.eINSTANCE
- .getLiteralUnlimitedNatural()))).setValue(value);
+ ? property.getDefaultValue()
+ : property.createDefaultValue(UML2Package.eINSTANCE
+ .getLiteralUnlimitedNatural()))).setValue(value);
}
public static String getDefault(Property property) {
return null == property.getDefaultValue()
- ? EMPTY_STRING : property.getDefaultValue().stringValue();
+ ? EMPTY_STRING
+ : property.getDefaultValue().stringValue();
}
/**
@@ -290,15 +293,13 @@
result = false;
if (null != diagnostics) {
- diagnostics
- .add(new BasicDiagnostic(
- Diagnostic.ERROR,
- UML2Validator.DIAGNOSTIC_SOURCE,
- UML2Validator.PROPERTY__OPPOSITE_IS_OTHER_END,
- UML2Plugin.INSTANCE.getString(
- "_UI_Property_OppositeIsOtherEnd_diagnostic", //$NON-NLS-1$
- getMessageSubstitutions(context, property)),
- new Object[] {property, opposite}));
+ diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+ UML2Validator.DIAGNOSTIC_SOURCE,
+ UML2Validator.PROPERTY__OPPOSITE_IS_OTHER_END,
+ UML2Plugin.INSTANCE.getString(
+ "_UI_Property_OppositeIsOtherEnd_diagnostic", //$NON-NLS-1$
+ getMessageSubstitutions(context, property)),
+ new Object[]{property, opposite}));
}
}
@@ -329,15 +330,15 @@
if (null != diagnostics) {
diagnostics
.add(new BasicDiagnostic(
- Diagnostic.WARNING,
- UML2Validator.DIAGNOSTIC_SOURCE,
- UML2Validator.PROPERTY__MULTIPLICITY_OF_COMPOSITE,
- UML2Plugin.INSTANCE
- .getString(
- "_UI_Property_MultiplicityOfComposite_diagnostic", //$NON-NLS-1$
- getMessageSubstitutions(context,
- property)),
- new Object[] {property, new Integer(upperBound)}));
+ Diagnostic.WARNING,
+ UML2Validator.DIAGNOSTIC_SOURCE,
+ UML2Validator.PROPERTY__MULTIPLICITY_OF_COMPOSITE,
+ UML2Plugin.INSTANCE
+ .getString(
+ "_UI_Property_MultiplicityOfComposite_diagnostic", //$NON-NLS-1$
+ getMessageSubstitutions(context,
+ property)), new Object[]{property,
+ new Integer(upperBound)}));
}
}
}
@@ -355,8 +356,8 @@
DiagnosticChain diagnostics, Map context) {
boolean result = true;
- spLoop: for (Iterator sp = property.getSubsettedProperties().iterator(); sp
- .hasNext();) {
+ spLoop : for (Iterator sp = property.getSubsettedProperties()
+ .iterator(); sp.hasNext();) {
Property subsettedProperty = (Property) sp.next();
@@ -380,13 +381,13 @@
return result;
} else {
diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
- UML2Validator.DIAGNOSTIC_SOURCE,
- UML2Validator.PROPERTY__SUBSETTING_CONTEXT,
- UML2Plugin.INSTANCE.getString(
- "_UI_Property_SubsettingContext_diagnostic", //$NON-NLS-1$
- getMessageSubstitutions(context, property,
- subsettedProperty)),
- new Object[] {property, subsettedProperty}));
+ UML2Validator.DIAGNOSTIC_SOURCE,
+ UML2Validator.PROPERTY__SUBSETTING_CONTEXT,
+ UML2Plugin.INSTANCE.getString(
+ "_UI_Property_SubsettingContext_diagnostic", //$NON-NLS-1$
+ getMessageSubstitutions(context, property,
+ subsettedProperty)), new Object[]{property,
+ subsettedProperty}));
}
}
@@ -415,15 +416,15 @@
} else {
diagnostics
.add(new BasicDiagnostic(
- Diagnostic.WARNING,
- UML2Validator.DIAGNOSTIC_SOURCE,
- UML2Validator.PROPERTY__NAVIGABLE_PROPERTY_REDEFINITION,
- UML2Plugin.INSTANCE
- .getString(
- "_UI_Property_NavigablePropertyRedefinition_diagnostic", //$NON-NLS-1$
- getMessageSubstitutions(context,
- property, subsettedProperty)),
- new Object[] {property, subsettedProperty}));
+ Diagnostic.WARNING,
+ UML2Validator.DIAGNOSTIC_SOURCE,
+ UML2Validator.PROPERTY__NAVIGABLE_PROPERTY_REDEFINITION,
+ UML2Plugin.INSTANCE
+ .getString(
+ "_UI_Property_NavigablePropertyRedefinition_diagnostic", //$NON-NLS-1$
+ getMessageSubstitutions(context, property,
+ subsettedProperty)), new Object[]{
+ property, subsettedProperty}));
}
}
}
@@ -441,15 +442,15 @@
} else {
diagnostics
.add(new BasicDiagnostic(
- Diagnostic.WARNING,
- UML2Validator.DIAGNOSTIC_SOURCE,
- UML2Validator.PROPERTY__NAVIGABLE_PROPERTY_REDEFINITION,
- UML2Plugin.INSTANCE
- .getString(
- "_UI_Property_NavigablePropertyRedefinition_diagnostic", //$NON-NLS-1$
- getMessageSubstitutions(context,
- property, redefinedProperty)),
- new Object[] {property, redefinedProperty}));
+ Diagnostic.WARNING,
+ UML2Validator.DIAGNOSTIC_SOURCE,
+ UML2Validator.PROPERTY__NAVIGABLE_PROPERTY_REDEFINITION,
+ UML2Plugin.INSTANCE
+ .getString(
+ "_UI_Property_NavigablePropertyRedefinition_diagnostic", //$NON-NLS-1$
+ getMessageSubstitutions(context, property,
+ redefinedProperty)), new Object[]{
+ property, redefinedProperty}));
}
}
}
@@ -482,13 +483,13 @@
return result;
} else {
diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
- UML2Validator.DIAGNOSTIC_SOURCE,
- UML2Validator.PROPERTY__SUBSETTING_RULES,
- UML2Plugin.INSTANCE.getString(
- "_UI_Property_SubsettingRules_diagnostic", //$NON-NLS-1$
- getMessageSubstitutions(context, property,
- subsettedProperty)),
- new Object[] {property, subsettedProperty}));
+ UML2Validator.DIAGNOSTIC_SOURCE,
+ UML2Validator.PROPERTY__SUBSETTING_RULES,
+ UML2Plugin.INSTANCE.getString(
+ "_UI_Property_SubsettingRules_diagnostic", //$NON-NLS-1$
+ getMessageSubstitutions(context, property,
+ subsettedProperty)), new Object[]{property,
+ subsettedProperty}));
}
}
}
@@ -511,12 +512,12 @@
if (null != diagnostics) {
diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
- UML2Validator.DIAGNOSTIC_SOURCE,
- UML2Validator.PROPERTY__NAVIGABLE_READONLY,
- UML2Plugin.INSTANCE.getString(
- "_UI_Property_NavigableReadOnly_diagnostic", //$NON-NLS-1$
- getMessageSubstitutions(context, property)),
- new Object [] {property}));
+ UML2Validator.DIAGNOSTIC_SOURCE,
+ UML2Validator.PROPERTY__NAVIGABLE_READONLY,
+ UML2Plugin.INSTANCE.getString(
+ "_UI_Property_NavigableReadOnly_diagnostic", //$NON-NLS-1$
+ getMessageSubstitutions(context, property)),
+ new Object[]{property}));
}
}
@@ -535,16 +536,13 @@
result = false;
if (null != diagnostics) {
- diagnostics
- .add(new BasicDiagnostic(
- Diagnostic.WARNING,
- UML2Validator.DIAGNOSTIC_SOURCE,
- UML2Validator.PROPERTY__DERIVED_UNION_IS_DERIVED,
- UML2Plugin.INSTANCE
- .getString(
- "_UI_Property_DerivedUnionIsDerived_diagnostic", //$NON-NLS-1$
- getMessageSubstitutions(context, property)),
- new Object[] {property}));
+ diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+ UML2Validator.DIAGNOSTIC_SOURCE,
+ UML2Validator.PROPERTY__DERIVED_UNION_IS_DERIVED,
+ UML2Plugin.INSTANCE.getString(
+ "_UI_Property_DerivedUnionIsDerived_diagnostic", //$NON-NLS-1$
+ getMessageSubstitutions(context, property)),
+ new Object[]{property}));
}
}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/RedefinableElementOperations.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/RedefinableElementOperations.java
index 3755d79..e8615ad 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/RedefinableElementOperations.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/RedefinableElementOperations.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: RedefinableElementOperations.java,v 1.6 2004/05/11 15:24:01 khussey Exp $
+ * $Id: RedefinableElementOperations.java,v 1.7 2004/06/17 03:20:09 khussey Exp $
*/
package org.eclipse.uml2.internal.operation;
@@ -87,7 +87,7 @@
RedefinableElement redefinedElement = (RedefinableElement) redefinedElements
.next();
- if (!redefinableElement.isConsistentWith(redefinedElement)) {
+ if (!redefinedElement.isConsistentWith(redefinableElement)) {
result = false;
if (null == diagnostics) {
