https://bugs.eclipse.org/bugs/show_bug.cgi?id=77405
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Classifier.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Classifier.java
index fd57132..1b1a7f9 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Classifier.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Classifier.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: Classifier.java,v 1.16 2005/05/18 16:38:30 khussey Exp $
+ * $Id: Classifier.java,v 1.17 2005/06/02 15:02:47 khussey Exp $
*/
package org.eclipse.uml2;
@@ -528,7 +528,7 @@
* member->select(oclIsKindOf(Feature))
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Set"
+ * @model dataType="org.eclipse.uml2.Set"
* @generated
*/
Set allFeatures();
@@ -542,7 +542,7 @@
* not self.allParents()->includes(self)
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateNoCyclesInGeneralization(DiagnosticChain diagnostics, Map context);
@@ -556,7 +556,7 @@
* self.parents()->forAll(c | self.maySpecializeType(c))
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateSpecializeType(DiagnosticChain diagnostics, Map context);
@@ -570,7 +570,7 @@
* self.inheritedMember->includesAll(self.inherit(self.parents()->collect(p | p.inheritableMembers(self)))
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateInheritedMember(DiagnosticChain diagnostics, Map context);
@@ -584,7 +584,7 @@
* self.inherit(self.parents()->collect(p | p.inheritableMembers(self))
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Set"
+ * @model dataType="org.eclipse.uml2.Set"
* @generated
*/
Set inheritedMember();
@@ -598,7 +598,7 @@
* generalization.general
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Set"
+ * @model dataType="org.eclipse.uml2.Set"
* @generated
*/
Set parents();
@@ -612,7 +612,7 @@
* self.parents()->union(self.parents()->collect(p | p.allParents())
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Set"
+ * @model dataType="org.eclipse.uml2.Set"
* @generated
*/
Set allParents();
@@ -626,7 +626,7 @@
* member->select(m | c.hasVisibilityOf(m))
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Set"
+ * @model dataType="org.eclipse.uml2.Set"
* @generated
*/
Set inheritableMembers(Classifier c);
@@ -640,7 +640,7 @@
* true
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean hasVisibilityOf(NamedElement n);
@@ -654,7 +654,7 @@
* inhs
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Set" parameters="org.eclipse.uml2.Set"
+ * @model dataType="org.eclipse.uml2.Set" inhsDataType="org.eclipse.uml2.Set"
* @generated
*/
Set inherit(Set inhs);
@@ -668,7 +668,7 @@
* self.oclIsKindOf(c.oclType)
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean maySpecializeType(Classifier c);
@@ -682,7 +682,7 @@
* self.parents()
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Set"
+ * @model dataType="org.eclipse.uml2.Set"
* @generated
*/
Set general();
@@ -696,7 +696,7 @@
* general = self.parents()
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateGeneralEqualsParents(DiagnosticChain diagnostics, Map context);
@@ -710,7 +710,7 @@
* (self=other) or (self.allParents()->includes(other))
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean conformsTo(Classifier other);
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Constraint.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Constraint.java
index c3e73af..c60ab07 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Constraint.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Constraint.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: Constraint.java,v 1.8 2005/05/18 16:38:30 khussey Exp $
+ * $Id: Constraint.java,v 1.9 2005/06/02 15:02:47 khussey Exp $
*/
package org.eclipse.uml2;
@@ -168,7 +168,7 @@
* not constrainedElement->includes(self)
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateNotApplyToSelf(DiagnosticChain diagnostics, Map context);
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Element.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Element.java
index 746a5f1..4b1f69c 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Element.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Element.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: Element.java,v 1.12 2005/05/18 16:38:29 khussey Exp $
+ * $Id: Element.java,v 1.13 2005/06/02 15:02:47 khussey Exp $
*/
package org.eclipse.uml2;
@@ -145,7 +145,7 @@
* not self.allOwnedElements()->includes(self)
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateNotOwnSelf(DiagnosticChain diagnostics, Map context);
@@ -159,7 +159,7 @@
* self.mustBeOwned() implies owner->notEmpty()
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateHasOwner(DiagnosticChain diagnostics, Map context);
@@ -173,7 +173,7 @@
* ownedElement->union(ownedElement->collect(e | e.allOwnedElements()))
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Set"
+ * @model dataType="org.eclipse.uml2.Set"
* @generated
*/
Set allOwnedElements();
@@ -187,7 +187,7 @@
* true
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean mustBeOwned();
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ElementImport.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ElementImport.java
index 4338a6c..dc277b2 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ElementImport.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ElementImport.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ElementImport.java,v 1.8 2005/05/18 16:38:30 khussey Exp $
+ * $Id: ElementImport.java,v 1.9 2005/06/02 15:02:47 khussey Exp $
*/
package org.eclipse.uml2;
@@ -182,7 +182,7 @@
* self.visibility = #public or self.visibility = #private
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateVisibilityPublicOrPrivate(DiagnosticChain diagnostics, Map context);
@@ -196,7 +196,7 @@
* self.importedElement.visibility.notEmpty() implies self.importedElement.visibility = #public
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateImportedElementIsPublic(DiagnosticChain diagnostics, Map context);
@@ -214,7 +214,7 @@
* endif
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.String" parameters=""
+ * @model dataType="org.eclipse.uml2.String" parameters="-"
* @generated
*/
String getName();
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/InstanceSpecification.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/InstanceSpecification.java
index 5d0bb82..ee2c246 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/InstanceSpecification.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/InstanceSpecification.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: InstanceSpecification.java,v 1.9 2005/05/18 16:38:30 khussey Exp $
+ * $Id: InstanceSpecification.java,v 1.10 2005/06/02 15:02:47 khussey Exp $
*/
package org.eclipse.uml2;
@@ -175,7 +175,7 @@
* classifier->exists(c | c.allFeatures()->includes(s.definingFeature))
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateSlotsAreDefined(DiagnosticChain diagnostics, Map context);
@@ -191,7 +191,7 @@
* )
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateNoDuplicateSlots(DiagnosticChain diagnostics, Map context);
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/MultiplicityElement.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/MultiplicityElement.java
index 323d833..ec16098 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/MultiplicityElement.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/MultiplicityElement.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: MultiplicityElement.java,v 1.8 2005/05/18 16:38:30 khussey Exp $
+ * $Id: MultiplicityElement.java,v 1.9 2005/06/02 15:02:47 khussey Exp $
*/
package org.eclipse.uml2;
@@ -244,7 +244,7 @@
* if lowerValue->isEmpty() then 1 else lowerValue.integerValue() endif
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Integer"
+ * @model dataType="org.eclipse.uml2.Integer"
* @generated
*/
int lowerBound();
@@ -258,7 +258,7 @@
* if upperValue->isEmpty() then 1 else upperValue.unlimitedValue() endif
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.UnlimitedNatural"
+ * @model dataType="org.eclipse.uml2.UnlimitedNatural"
* @generated
*/
int upperBound();
@@ -272,7 +272,7 @@
* upperBound() > 1
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean" parameters="-"
* @generated
*/
boolean isMultivalued();
@@ -287,7 +287,7 @@
*
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean" parameters="org.eclipse.uml2.Integer"
+ * @model dataType="org.eclipse.uml2.Boolean" CDataType="org.eclipse.uml2.Integer"
* @generated
*/
boolean includesCardinality(int C);
@@ -301,7 +301,7 @@
* (self.lowerBound() <= M.lowerBound()) and (self.upperBound() >= M.upperBound())
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean includesMultiplicity(MultiplicityElement M);
@@ -315,7 +315,7 @@
* upperBound()->notEmpty() implies upperBound() > 0
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateUpperGt0(DiagnosticChain diagnostics, Map context);
@@ -329,7 +329,7 @@
* lowerBound()->notEmpty() implies lowerBound() >= 0
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateLowerGe0(DiagnosticChain diagnostics, Map context);
@@ -343,7 +343,7 @@
* (upperBound()->notEmpty() and lowerBound()->notEmpty()) implies upperBound() >= lowerBound()
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateUpperGeLower(DiagnosticChain diagnostics, Map context);
@@ -357,7 +357,7 @@
* lower=lowerBound()
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateLowerEqLowerbound(DiagnosticChain diagnostics, Map context);
@@ -371,7 +371,7 @@
* upper = upperBound()
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateUpperEqUpperbound(DiagnosticChain diagnostics, Map context);
@@ -385,7 +385,7 @@
* lowerBound()
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Integer"
+ * @model dataType="org.eclipse.uml2.Integer"
* @generated
*/
int lower();
@@ -399,7 +399,7 @@
* upperBound()
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.UnlimitedNatural"
+ * @model dataType="org.eclipse.uml2.UnlimitedNatural"
* @generated
*/
int upper();
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/NamedElement.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/NamedElement.java
index e71c87a..17eee09 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/NamedElement.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/NamedElement.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: NamedElement.java,v 1.11 2005/05/18 16:38:30 khussey Exp $
+ * $Id: NamedElement.java,v 1.12 2005/06/02 15:02:47 khussey Exp $
*/
package org.eclipse.uml2;
@@ -230,7 +230,7 @@
* endif
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Sequence"
+ * @model dataType="org.eclipse.uml2.Sequence" many="false"
* @generated
*/
List allNamespaces();
@@ -247,7 +247,7 @@
* endif
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean isDistinguishableFrom(NamedElement n, Namespace ns);
@@ -261,7 +261,7 @@
* '::'
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.String"
+ * @model dataType="org.eclipse.uml2.String"
* @generated
*/
String separator();
@@ -280,7 +280,7 @@
* endif
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.String"
+ * @model dataType="org.eclipse.uml2.String"
* @generated
*/
String qualifiedName();
@@ -294,7 +294,7 @@
* namespace->isEmpty() implies visibility->isEmpty()
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateVisibilityNeedsOwnership(DiagnosticChain diagnostics, Map context);
@@ -326,7 +326,7 @@
* implies self.qualifiedName->isEmpty()
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateNoName(DiagnosticChain diagnostics, Map context);
@@ -343,7 +343,7 @@
* ns.name->union(self.separator())->union(result))
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateQualifiedName(DiagnosticChain diagnostics, Map context);
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Namespace.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Namespace.java
index 5802b81..548cb6e 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Namespace.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Namespace.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: Namespace.java,v 1.9 2005/05/18 16:38:29 khussey Exp $
+ * $Id: Namespace.java,v 1.10 2005/06/02 15:02:47 khussey Exp $
*/
package org.eclipse.uml2;
@@ -272,7 +272,7 @@
* endif
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Set"
+ * @model dataType="org.eclipse.uml2.Set"
* @generated
*/
Set getNamesOfMember(NamedElement element);
@@ -288,7 +288,7 @@
* memb.isDistinguishableFrom(other, self)))
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean membersAreDistinguishable();
@@ -302,7 +302,7 @@
* self.importedMember->includesAll(self.importedMembers(self.elementImport.importedElement.asSet()->union(self.packageImport.importedPackage->collect(p | p.visibleMembers()))))
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateImportedMemberDerived(DiagnosticChain diagnostics, Map context);
@@ -316,7 +316,7 @@
* self.importedMembers(self.elementImport.importedElement.asSet()->union(self.packageImport.importedPackage->collect(p | p.visibleMembers())))
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Set"
+ * @model dataType="org.eclipse.uml2.Set"
* @generated
*/
Set importedMember();
@@ -330,7 +330,7 @@
* self.excludeCollisions(imps)->select(imp | self.ownedMember->forAll(mem | mem.imp.isDistinguishableFrom(mem, self)))
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Set" parameters="org.eclipse.uml2.Set"
+ * @model dataType="org.eclipse.uml2.Set" impsDataType="org.eclipse.uml2.Set"
* @generated
*/
Set importMembers(Set imps);
@@ -344,7 +344,7 @@
* imps->reject(imp1 | imps.exists(imp2 | not imp1.isDistinguishableFrom(imp2, self)))
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Set" parameters="org.eclipse.uml2.Set"
+ * @model dataType="org.eclipse.uml2.Set" impsDataType="org.eclipse.uml2.Set"
* @generated
*/
Set excludeCollisions(Set imps);
@@ -387,7 +387,7 @@
* membersAreDistinguishable()
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateMembersAreDistinguishable(DiagnosticChain diagnostics, Map context);
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Operation.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Operation.java
index 0503db6..1a03b04 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Operation.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Operation.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: Operation.java,v 1.11 2005/05/18 16:38:30 khussey Exp $
+ * $Id: Operation.java,v 1.12 2005/06/02 15:02:47 khussey Exp $
*/
package org.eclipse.uml2;
@@ -332,7 +332,7 @@
*
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateTypeOfResult(DiagnosticChain diagnostics, Map context);
@@ -346,7 +346,7 @@
* if returnResult->size() = 1 then returnResult->any().isOrdered else false endif
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean" parameters="-"
* @generated
*/
boolean isOrdered();
@@ -360,7 +360,7 @@
* if returnResult->size() = 1 then returnResult->any().isUnique else true endif
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean" parameters="-"
* @generated
*/
boolean isUnique();
@@ -388,7 +388,7 @@
* bodyCondition->notEmpty() implies isQuery
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateOnlyBodyForQuery(DiagnosticChain diagnostics, Map context);
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Package.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Package.java
index d70d21d..df6624b 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Package.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Package.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: Package.java,v 1.15 2005/05/18 16:38:31 khussey Exp $
+ * $Id: Package.java,v 1.16 2005/06/02 15:02:47 khussey Exp $
*/
package org.eclipse.uml2;
@@ -287,7 +287,7 @@
* self.ownedElements->forAll(e | e.visibility->notEmpty() implies e.visbility = #public or e.visibility = #private)
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateElementsPublicOrPrivate(DiagnosticChain diagnostics, Map context);
@@ -301,7 +301,7 @@
* member->select( m | self.makesVisible(m))
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Set"
+ * @model dataType="org.eclipse.uml2.Set"
* @generated
*/
Set visibleMembers();
@@ -315,7 +315,7 @@
* el.visibility->isEmpty() or el.visibility = #public
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean makesVisible(NamedElement el);
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/PackageImport.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/PackageImport.java
index 93e2f26..1ca9ab1 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/PackageImport.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/PackageImport.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: PackageImport.java,v 1.8 2005/05/18 16:38:30 khussey Exp $
+ * $Id: PackageImport.java,v 1.9 2005/06/02 15:02:47 khussey Exp $
*/
package org.eclipse.uml2;
@@ -150,7 +150,7 @@
* self.visibility = #public or self.visibility = #private
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validatePublicOrPrivate(DiagnosticChain diagnostics, Map context);
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Property.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Property.java
index bfe8e5d..5e7f60c 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Property.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Property.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: Property.java,v 1.10 2005/05/18 16:38:29 khussey Exp $
+ * $Id: Property.java,v 1.11 2005/06/02 15:02:47 khussey Exp $
*/
package org.eclipse.uml2;
@@ -511,7 +511,7 @@
* endif
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateOppositeIsOtherEnd(DiagnosticChain diagnostics, Map context);
@@ -543,7 +543,7 @@
* isComposite implies (upperBound()->isEmpty() or upperBound() <= 1)
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateMultiplicityOfComposite(DiagnosticChain diagnostics, Map context);
@@ -560,7 +560,7 @@
* sp.subsettingContext()->exists(c | sc.conformsTo(c)))))
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateSubsettingContext(DiagnosticChain diagnostics, Map context);
@@ -578,7 +578,7 @@
* implies class->notEmpty())
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateNavigablePropertyRedefinition(DiagnosticChain diagnostics, Map context);
@@ -595,7 +595,7 @@
* upperBound()<=sp.upperBound() ))
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateSubsettingRules(DiagnosticChain diagnostics, Map context);
@@ -609,7 +609,7 @@
* isReadOnly implies class->notEmpty()
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateNavigableReadonly(DiagnosticChain diagnostics, Map context);
@@ -623,7 +623,7 @@
* isDerivedUnion implies isDerived
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateDerivedUnionIsDerived(DiagnosticChain diagnostics, Map context);
@@ -640,7 +640,7 @@
* endif
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Set"
+ * @model dataType="org.eclipse.uml2.Set"
* @generated
*/
Set subsettingContext();
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/RedefinableElement.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/RedefinableElement.java
index 6868c14..fb0c052 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/RedefinableElement.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/RedefinableElement.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: RedefinableElement.java,v 1.11 2005/05/18 21:13:19 khussey Exp $
+ * $Id: RedefinableElement.java,v 1.12 2005/06/02 15:02:47 khussey Exp $
*/
package org.eclipse.uml2;
@@ -117,7 +117,7 @@
* false
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean isConsistentWith(RedefinableElement redefinee);
@@ -131,7 +131,7 @@
* self.redefinitionContext->exists(c | redefinable.redefinitionContext->exists(r | c.allParents()->includes(r)))
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean isRedefinitionContextValid(RedefinableElement redefinable);
@@ -172,7 +172,7 @@
* self.redefinedElement->forAll(e | self.isRedefinitionContextValid(e))
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateRedefinitionContextValid(DiagnosticChain diagnostics, Map context);
@@ -186,7 +186,7 @@
* self.redefinedElement->forAll(re | re.isConsistentWith(self))
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean validateRedefinitionConsistent(DiagnosticChain diagnostics, Map context);
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateableElement.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateableElement.java
index 8105e7a..7cf438e 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateableElement.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateableElement.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: TemplateableElement.java,v 1.8 2005/05/18 16:38:30 khussey Exp $
+ * $Id: TemplateableElement.java,v 1.9 2005/06/02 15:02:47 khussey Exp $
*/
package org.eclipse.uml2;
@@ -144,7 +144,7 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @model dataType="org.eclipse.uml2.Set"
+ * @model dataType="org.eclipse.uml2.Set"
* @generated
*/
Set parameterableElements();
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Type.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Type.java
index d69ce5c..cfae61e 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Type.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Type.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: Type.java,v 1.7 2005/05/18 16:38:29 khussey Exp $
+ * $Id: Type.java,v 1.8 2005/06/02 15:02:47 khussey Exp $
*/
package org.eclipse.uml2;
@@ -70,7 +70,7 @@
* false
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean conformsTo(Type other);
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ValueSpecification.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ValueSpecification.java
index 57ed1bd..879e219 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ValueSpecification.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ValueSpecification.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: ValueSpecification.java,v 1.6 2005/05/18 16:38:30 khussey Exp $
+ * $Id: ValueSpecification.java,v 1.7 2005/06/02 15:02:47 khussey Exp $
*/
package org.eclipse.uml2;
@@ -44,7 +44,7 @@
* false
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean" parameters="-"
* @generated
*/
boolean isComputable();
@@ -58,7 +58,7 @@
* Set{}
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Integer"
+ * @model dataType="org.eclipse.uml2.Integer"
* @generated
*/
int integerValue();
@@ -72,7 +72,7 @@
* Set{}
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean"
* @generated
*/
boolean booleanValue();
@@ -86,7 +86,7 @@
* Set{}
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.String"
+ * @model dataType="org.eclipse.uml2.String"
* @generated
*/
String stringValue();
@@ -100,7 +100,7 @@
* Set{}
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.UnlimitedNatural"
+ * @model dataType="org.eclipse.uml2.UnlimitedNatural"
* @generated
*/
int unlimitedValue();
@@ -114,7 +114,7 @@
* false
* </code>
* <!-- end-model-doc -->
- * @model dataType="org.eclipse.uml2.Boolean"
+ * @model dataType="org.eclipse.uml2.Boolean" parameters="-"
* @generated
*/
boolean isNull();
