https://bugs.eclipse.org/bugs/show_bug.cgi?id=77405
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 de7a22a..0725e3a 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.10 2005/06/09 02:18:09 khussey Exp $
+ * $Id: ElementImport.java,v 1.11 2005/06/22 20:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -214,7 +214,7 @@
 	 * endif
 	 * </code>
 	 * <!-- end-model-doc -->
-	 * @model dataType="org.eclipse.uml2.String" parameters=""
+	 * @model kind="operation" dataType="org.eclipse.uml2.String"
 	 * @generated
 	 */
 	String getName();
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 f268c75..8c87756 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.12 2005/06/15 20:06:01 khussey Exp $
+ * $Id: MultiplicityElement.java,v 1.13 2005/06/22 20:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -272,7 +272,7 @@
 	 * upperBound() > 1
 	 * </code>
 	 * <!-- end-model-doc -->
-	 * @model dataType="org.eclipse.uml2.Boolean" parameters=""
+	 * @model kind="operation" dataType="org.eclipse.uml2.Boolean"
 	 * @generated
 	 */
 	boolean isMultivalued();
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 9762172..220c957 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.14 2005/06/15 20:06:01 khussey Exp $
+ * $Id: Operation.java,v 1.15 2005/06/22 20:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -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" parameters=""
+	 * @model kind="operation" dataType="org.eclipse.uml2.Boolean"
 	 * @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" parameters=""
+	 * @model kind="operation" dataType="org.eclipse.uml2.Boolean"
 	 * @generated
 	 */
 	boolean isUnique();
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/UML2Package.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/UML2Package.java
index facefe2..56e4a3e 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/UML2Package.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/UML2Package.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *
- * $Id: UML2Package.java,v 1.18 2005/05/18 16:38:30 khussey Exp $
+ * $Id: UML2Package.java,v 1.19 2005/06/22 20:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -32,6 +32,7 @@
  * </ul>
  * <!-- end-user-doc -->
  * @see org.eclipse.uml2.UML2Factory
+ * @model kind="package"
  * @generated
  */
 public interface UML2Package extends EPackage{
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 6f479e6..e59ed72 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.8 2005/06/09 02:18:09 khussey Exp $
+ * $Id: ValueSpecification.java,v 1.9 2005/06/22 20:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -44,7 +44,7 @@
 	 * false
 	 * </code>
 	 * <!-- end-model-doc -->
-	 * @model dataType="org.eclipse.uml2.Boolean" parameters=""
+	 * @model kind="operation" dataType="org.eclipse.uml2.Boolean"
 	 * @generated
 	 */
 	boolean isComputable();
@@ -114,7 +114,7 @@
 	 * false
 	 * </code>
 	 * <!-- end-model-doc -->
-	 * @model dataType="org.eclipse.uml2.Boolean" parameters=""
+	 * @model kind="operation" dataType="org.eclipse.uml2.Boolean"
 	 * @generated
 	 */
 	boolean isNull();