be specific about multiplicities

javadoc

4 files changed, 27 insertions, 5 deletions

diff --git a/plugins/org.eclipse.gmf.tooldef/models/tooldef.ecore b/plugins/org.eclipse.gmf.tooldef/models/tooldef.ecore
index a53f9d65c..132a57776 100644
--- a/plugins/org.eclipse.gmf.tooldef/models/tooldef.ecore
+++ b/plugins/org.eclipse.gmf.tooldef/models/tooldef.ecore
@@ -52,7 +52,8 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CreationTool" eSuperTypes="#//AbstractTool"/>
   <eClassifiers xsi:type="ecore:EClass" name="GenericTool" eSuperTypes="#//AbstractTool">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="toolClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="toolClass" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ItemBase" interface="true"/>
   <eClassifiers xsi:type="ecore:EClass" name="Menu" abstract="true">
@@ -106,8 +107,19 @@
     </eAnnotations>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BundleImage" eSuperTypes="#//Image">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bundle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Image bundled as part of distribution"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Relative path to image"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bundle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Empty value means image path is relative to generated bundle"/>
+      </eAnnotations>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="StyleSelector" interface="true">
     <eOperations name="isOk" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/BundleImage.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/BundleImage.java
index 1db063a43..a669077c6 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/BundleImage.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/BundleImage.java
@@ -11,6 +11,10 @@ package org.eclipse.gmf.tooldef;
  * A representation of the model object '<em><b>Bundle Image</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * Image bundled as part of distribution
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
@@ -32,6 +36,9 @@ public interface BundleImage extends Image {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Relative path to image
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Path</em>' attribute.
 	 * @see #setPath(String)
 	 * @see org.eclipse.gmf.tooldef.GMFToolPackage#getBundleImage_Path()
@@ -58,6 +65,9 @@ public interface BundleImage extends Image {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Empty value means image path is relative to generated bundle
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Bundle</em>' attribute.
 	 * @see #setBundle(String)
 	 * @see org.eclipse.gmf.tooldef.GMFToolPackage#getBundleImage_Bundle()
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GenericTool.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GenericTool.java
index 49b4c2c3e..b1815cc99 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GenericTool.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GenericTool.java
@@ -34,7 +34,7 @@ public interface GenericTool extends AbstractTool {
 	 * @return the value of the '<em>Tool Class</em>' attribute.
 	 * @see #setToolClass(String)
 	 * @see org.eclipse.gmf.tooldef.GMFToolPackage#getGenericTool_ToolClass()
-	 * @model
+	 * @model required="true"
 	 * @generated
 	 */
 	String getToolClass();
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GMFToolPackageImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GMFToolPackageImpl.java
index 2588bde59..e26cb7307 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GMFToolPackageImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GMFToolPackageImpl.java
@@ -1048,7 +1048,7 @@ public class GMFToolPackageImpl extends EPackageImpl implements GMFToolPackage {
 		initEClass(creationToolEClass, CreationTool.class, "CreationTool", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 		initEClass(genericToolEClass, GenericTool.class, "GenericTool", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getGenericTool_ToolClass(), ecorePackage.getEString(), "toolClass", null, 0, 1, GenericTool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+		initEAttribute(getGenericTool_ToolClass(), ecorePackage.getEString(), "toolClass", null, 1, 1, GenericTool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
 				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(itemBaseEClass, ItemBase.class, "ItemBase", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);