*** empty log message ***

33 files changed, 5496 insertions, 0 deletions

diff --git a/archive/org.eclipse.gmf.diadef/.classpath b/archive/org.eclipse.gmf.diadef/.classpath
new file mode 100644
index 000000000..ecab266ce
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry sourcepath="JRE_SRC" kind="var" path="JRE_LIB"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/archive/org.eclipse.gmf.diadef/.cvsignore b/archive/org.eclipse.gmf.diadef/.cvsignore
new file mode 100644
index 000000000..ba077a403
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/.cvsignore
@@ -0,0 +1 @@
+bin
diff --git a/archive/org.eclipse.gmf.diadef/.project b/archive/org.eclipse.gmf.diadef/.project
new file mode 100644
index 000000000..06a28f495
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.gmf.diadef</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/archive/org.eclipse.gmf.diadef/META-INF/MANIFEST.MF b/archive/org.eclipse.gmf.diadef/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..2e5a20191
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Diagram Definition Model
+Bundle-SymbolicName: org.eclipse.gmf.diadef; singleton:=true
+Bundle-Version: 1.0.0
+Bundle-Vendor: Eclipse.org
+Export-Package: org.eclipse.gmf.diadef,
+ org.eclipse.gmf.diadef.impl;x-friends:="org.eclipse.gmf.map",
+ org.eclipse.gmf.diadef.util
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport
+Eclipse-AutoStart: true
diff --git a/archive/org.eclipse.gmf.diadef/build.properties b/archive/org.eclipse.gmf.diadef/build.properties
new file mode 100644
index 000000000..416c71d86
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/build.properties
@@ -0,0 +1,9 @@
+bin.includes = plugin.xml,\
+               model/,\
+               plugin.properties,\
+               META-INF/,\
+               .,\
+               models/
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/archive/org.eclipse.gmf.diadef/models/diadef.ecore b/archive/org.eclipse.gmf.diadef/models/diadef.ecore
new file mode 100644
index 000000000..4a00e7acb
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/models/diadef.ecore
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="diadef"
+    nsURI="http://www.eclipse.org/gmf/2005/DiagramDefinition" nsPrefix="diadef">
+  <eClassifiers xsi:type="ecore:EClass" name="DiagramElement" abstract="true" eSuperTypes="#//CommonBase">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="needsTool" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="toolGroupID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="smallIconPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="largeIconPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Node" eSuperTypes="#//DiagramElement">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxWidth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxHeight" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultWidth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultHeight" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="compartments" upperBound="-1"
+        eType="#//Compartment" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Compartment" eSuperTypes="#//Identity">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="collapsible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="needsTitle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Connection" eSuperTypes="#//DiagramElement">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineKind" lowerBound="1"
+        eType="#//LineKind"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sourceAdornment" eType="#//AdornmentKind"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetAdornment" eType="#//AdornmentKind"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Canvas" eSuperTypes="#//CommonBase">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1"
+        eType="#//Node" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="links" upperBound="-1"
+        eType="#//Connection" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="RunTimeProperty" eSuperTypes="#//Identity"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Identity" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        iD="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CommonBase" abstract="true" eSuperTypes="#//Identity">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
+        eType="#//RunTimeProperty" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="LineKind">
+    <eLiterals name="SOLID"/>
+    <eLiterals name="DOT" value="1"/>
+    <eLiterals name="DASH" value="2"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="AdornmentKind">
+    <eLiterals name="None"/>
+    <eLiterals name="OpenTriangle" value="1"/>
+    <eLiterals name="FilledTriangle" value="2"/>
+    <eLiterals name="Rhomb" value="3"/>
+    <eLiterals name="FilledRhomb" value="4"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/archive/org.eclipse.gmf.diadef/models/diadef.genmodel b/archive/org.eclipse.gmf.diadef/models/diadef.genmodel
new file mode 100644
index 000000000..770688fbb
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/models/diadef.genmodel
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.gmf.diadef/src"
+    editDirectory="/org.eclipse.gmf.diadef.edit/src" editorDirectory="/org.eclipse.gmf.diadef.edit/src"
+    modelPluginID="org.eclipse.gmf.diadef" modelName="DiaDef" editPluginClass="org.eclipse.gmf.diadef.provider.DiagramDefEditPlugin"
+    editorPluginClass="org.eclipse.gmf.diadef.provider.DiagramDefEditPlugin" importerID="org.eclipse.emf.importer.ecore">
+  <foreignModel>diadef.ecore</foreignModel>
+  <genPackages prefix="DiagramDefinition" basePackage="org.eclipse.gmf" disposableProviderFactory="true"
+      ecorePackage="diadef.ecore#/">
+    <genEnums ecoreEnum="diadef.ecore#//LineKind">
+      <genEnumLiterals ecoreEnumLiteral="diadef.ecore#//LineKind/SOLID"/>
+      <genEnumLiterals ecoreEnumLiteral="diadef.ecore#//LineKind/DOT"/>
+      <genEnumLiterals ecoreEnumLiteral="diadef.ecore#//LineKind/DASH"/>
+    </genEnums>
+    <genEnums ecoreEnum="diadef.ecore#//AdornmentKind">
+      <genEnumLiterals ecoreEnumLiteral="diadef.ecore#//AdornmentKind/None"/>
+      <genEnumLiterals ecoreEnumLiteral="diadef.ecore#//AdornmentKind/OpenTriangle"/>
+      <genEnumLiterals ecoreEnumLiteral="diadef.ecore#//AdornmentKind/FilledTriangle"/>
+      <genEnumLiterals ecoreEnumLiteral="diadef.ecore#//AdornmentKind/Rhomb"/>
+      <genEnumLiterals ecoreEnumLiteral="diadef.ecore#//AdornmentKind/FilledRhomb"/>
+    </genEnums>
+    <genClasses image="false" ecoreClass="diadef.ecore#//DiagramElement">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diadef.ecore#//DiagramElement/needsTool"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diadef.ecore#//DiagramElement/toolGroupID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diadef.ecore#//DiagramElement/smallIconPath"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diadef.ecore#//DiagramElement/largeIconPath"/>
+    </genClasses>
+    <genClasses ecoreClass="diadef.ecore#//Node">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diadef.ecore#//Node/maxWidth"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diadef.ecore#//Node/maxHeight"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diadef.ecore#//Node/defaultWidth"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diadef.ecore#//Node/defaultHeight"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diadef.ecore#//Node/compartments"/>
+    </genClasses>
+    <genClasses ecoreClass="diadef.ecore#//Compartment">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diadef.ecore#//Compartment/collapsible"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diadef.ecore#//Compartment/needsTitle"/>
+    </genClasses>
+    <genClasses ecoreClass="diadef.ecore#//Connection">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diadef.ecore#//Connection/lineKind"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diadef.ecore#//Connection/sourceAdornment"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diadef.ecore#//Connection/targetAdornment"/>
+    </genClasses>
+    <genClasses ecoreClass="diadef.ecore#//Canvas">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diadef.ecore#//Canvas/nodes"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diadef.ecore#//Canvas/links"/>
+    </genClasses>
+    <genClasses ecoreClass="diadef.ecore#//RunTimeProperty"/>
+    <genClasses image="false" ecoreClass="diadef.ecore#//Identity">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diadef.ecore#//Identity/name"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="diadef.ecore#//CommonBase">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diadef.ecore#//CommonBase/properties"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/archive/org.eclipse.gmf.diadef/plugin.properties b/archive/org.eclipse.gmf.diadef/plugin.properties
new file mode 100644
index 000000000..8be8f3bea
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/plugin.properties
@@ -0,0 +1,20 @@
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+# ====================================================================
+# To code developer:
+#   Do NOT change the properties between this line and the
+#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
+#   Make a new property name, append to the end of the file and change
+#   the code to use the new property.
+# ====================================================================
+
+# ====================================================================
+# %%% END OF TRANSLATED PROPERTIES %%%
+# ====================================================================
+
+pluginName = DiaDef Model
+providerName = www.example.org
+
diff --git a/archive/org.eclipse.gmf.diadef/plugin.xml b/archive/org.eclipse.gmf.diadef/plugin.xml
new file mode 100644
index 000000000..8b740cfe7
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/plugin.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+    <extension point="org.eclipse.emf.ecore.generated_package">
+    <package 
+       uri = "http://www.eclipse.org/gmf/2005/DiagramDefinition" 
+       class = "org.eclipse.gmf.diadef.DiagramDefinitionPackage"
+       genModel = "models/diadef.genmodel" /> 
+  </extension>
+
+</plugin>
+
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/AdornmentKind.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/AdornmentKind.java
new file mode 100644
index 000000000..c8e131e2a
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/AdornmentKind.java
@@ -0,0 +1,216 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.AbstractEnumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Adornment Kind</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getAdornmentKind()
+ * @model
+ * @generated
+ */
+public final class AdornmentKind extends AbstractEnumerator {
+	/**
+	 * The '<em><b>None</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>None</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #NONE_LITERAL
+	 * @model name="None"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int NONE = 0;
+
+	/**
+	 * The '<em><b>Open Triangle</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>Open Triangle</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #OPEN_TRIANGLE_LITERAL
+	 * @model name="OpenTriangle"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int OPEN_TRIANGLE = 1;
+
+	/**
+	 * The '<em><b>Filled Triangle</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>Filled Triangle</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #FILLED_TRIANGLE_LITERAL
+	 * @model name="FilledTriangle"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int FILLED_TRIANGLE = 2;
+
+	/**
+	 * The '<em><b>Rhomb</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>Rhomb</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #RHOMB_LITERAL
+	 * @model name="Rhomb"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int RHOMB = 3;
+
+	/**
+	 * The '<em><b>Filled Rhomb</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>Filled Rhomb</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #FILLED_RHOMB_LITERAL
+	 * @model name="FilledRhomb"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int FILLED_RHOMB = 4;
+
+	/**
+	 * The '<em><b>None</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #NONE
+	 * @generated
+	 * @ordered
+	 */
+	public static final AdornmentKind NONE_LITERAL = new AdornmentKind(NONE, "None");
+
+	/**
+	 * The '<em><b>Open Triangle</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #OPEN_TRIANGLE
+	 * @generated
+	 * @ordered
+	 */
+	public static final AdornmentKind OPEN_TRIANGLE_LITERAL = new AdornmentKind(OPEN_TRIANGLE, "OpenTriangle");
+
+	/**
+	 * The '<em><b>Filled Triangle</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #FILLED_TRIANGLE
+	 * @generated
+	 * @ordered
+	 */
+	public static final AdornmentKind FILLED_TRIANGLE_LITERAL = new AdornmentKind(FILLED_TRIANGLE, "FilledTriangle");
+
+	/**
+	 * The '<em><b>Rhomb</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #RHOMB
+	 * @generated
+	 * @ordered
+	 */
+	public static final AdornmentKind RHOMB_LITERAL = new AdornmentKind(RHOMB, "Rhomb");
+
+	/**
+	 * The '<em><b>Filled Rhomb</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #FILLED_RHOMB
+	 * @generated
+	 * @ordered
+	 */
+	public static final AdornmentKind FILLED_RHOMB_LITERAL = new AdornmentKind(FILLED_RHOMB, "FilledRhomb");
+
+	/**
+	 * An array of all the '<em><b>Adornment Kind</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final AdornmentKind[] VALUES_ARRAY =
+		new AdornmentKind[] {
+			NONE_LITERAL,
+			OPEN_TRIANGLE_LITERAL,
+			FILLED_TRIANGLE_LITERAL,
+			RHOMB_LITERAL,
+			FILLED_RHOMB_LITERAL,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Adornment Kind</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Adornment Kind</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static AdornmentKind get(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			AdornmentKind result = VALUES_ARRAY[i];
+			if (result.toString().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Adornment Kind</b></em>' literal with the specified value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static AdornmentKind get(int value) {
+		switch (value) {
+			case NONE: return NONE_LITERAL;
+			case OPEN_TRIANGLE: return OPEN_TRIANGLE_LITERAL;
+			case FILLED_TRIANGLE: return FILLED_TRIANGLE_LITERAL;
+			case RHOMB: return RHOMB_LITERAL;
+			case FILLED_RHOMB: return FILLED_RHOMB_LITERAL;
+		}
+		return null;	
+	}
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private AdornmentKind(int value, String name) {
+		super(value, name);
+	}
+
+} //AdornmentKind
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/Canvas.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/Canvas.java
new file mode 100644
index 000000000..2e556e75c
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/Canvas.java
@@ -0,0 +1,61 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Canvas</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.gmf.diadef.Canvas#getNodes <em>Nodes</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.Canvas#getLinks <em>Links</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getCanvas()
+ * @model
+ * @generated
+ */
+public interface Canvas extends CommonBase {
+	/**
+	 * Returns the value of the '<em><b>Nodes</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.gmf.diadef.Node}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Nodes</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Nodes</em>' containment reference list.
+	 * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getCanvas_Nodes()
+	 * @model type="org.eclipse.gmf.diadef.Node" containment="true"
+	 * @generated
+	 */
+	EList getNodes();
+
+	/**
+	 * Returns the value of the '<em><b>Links</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.gmf.diadef.Connection}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Links</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Links</em>' containment reference list.
+	 * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getCanvas_Links()
+	 * @model type="org.eclipse.gmf.diadef.Connection" containment="true"
+	 * @generated
+	 */
+	EList getLinks();
+
+} // Canvas
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/CommonBase.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/CommonBase.java
new file mode 100644
index 000000000..82614b9f1
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/CommonBase.java
@@ -0,0 +1,44 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Common Base</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.gmf.diadef.CommonBase#getProperties <em>Properties</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getCommonBase()
+ * @model abstract="true"
+ * @generated
+ */
+public interface CommonBase extends Identity {
+	/**
+	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.gmf.diadef.RunTimeProperty}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Properties</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Properties</em>' containment reference list.
+	 * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getCommonBase_Properties()
+	 * @model type="org.eclipse.gmf.diadef.RunTimeProperty" containment="true"
+	 * @generated
+	 */
+	EList getProperties();
+
+} // CommonBase
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/Compartment.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/Compartment.java
new file mode 100644
index 000000000..35bd8771a
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/Compartment.java
@@ -0,0 +1,80 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Compartment</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.gmf.diadef.Compartment#isCollapsible <em>Collapsible</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.Compartment#isNeedsTitle <em>Needs Title</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getCompartment()
+ * @model
+ * @generated
+ */
+public interface Compartment extends Identity{
+	/**
+	 * Returns the value of the '<em><b>Collapsible</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Collapsible</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Collapsible</em>' attribute.
+	 * @see #setCollapsible(boolean)
+	 * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getCompartment_Collapsible()
+	 * @model
+	 * @generated
+	 */
+	boolean isCollapsible();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.diadef.Compartment#isCollapsible <em>Collapsible</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Collapsible</em>' attribute.
+	 * @see #isCollapsible()
+	 * @generated
+	 */
+	void setCollapsible(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Needs Title</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Needs Title</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Needs Title</em>' attribute.
+	 * @see #setNeedsTitle(boolean)
+	 * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getCompartment_NeedsTitle()
+	 * @model
+	 * @generated
+	 */
+	boolean isNeedsTitle();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.diadef.Compartment#isNeedsTitle <em>Needs Title</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Needs Title</em>' attribute.
+	 * @see #isNeedsTitle()
+	 * @generated
+	 */
+	void setNeedsTitle(boolean value);
+
+} // Compartment
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/Connection.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/Connection.java
new file mode 100644
index 000000000..6dbf9a9eb
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/Connection.java
@@ -0,0 +1,116 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Connection</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.gmf.diadef.Connection#getLineKind <em>Line Kind</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.Connection#getSourceAdornment <em>Source Adornment</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.Connection#getTargetAdornment <em>Target Adornment</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getConnection()
+ * @model
+ * @generated
+ */
+public interface Connection extends DiagramElement {
+	/**
+	 * Returns the value of the '<em><b>Line Kind</b></em>' attribute.
+	 * The literals are from the enumeration {@link org.eclipse.gmf.diadef.LineKind}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Line Kind</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Line Kind</em>' attribute.
+	 * @see org.eclipse.gmf.diadef.LineKind
+	 * @see #setLineKind(LineKind)
+	 * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getConnection_LineKind()
+	 * @model required="true"
+	 * @generated
+	 */
+	LineKind getLineKind();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.diadef.Connection#getLineKind <em>Line Kind</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Line Kind</em>' attribute.
+	 * @see org.eclipse.gmf.diadef.LineKind
+	 * @see #getLineKind()
+	 * @generated
+	 */
+	void setLineKind(LineKind value);
+
+	/**
+	 * Returns the value of the '<em><b>Source Adornment</b></em>' attribute.
+	 * The literals are from the enumeration {@link org.eclipse.gmf.diadef.AdornmentKind}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Source Adornment</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Source Adornment</em>' attribute.
+	 * @see org.eclipse.gmf.diadef.AdornmentKind
+	 * @see #setSourceAdornment(AdornmentKind)
+	 * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getConnection_SourceAdornment()
+	 * @model
+	 * @generated
+	 */
+	AdornmentKind getSourceAdornment();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.diadef.Connection#getSourceAdornment <em>Source Adornment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Source Adornment</em>' attribute.
+	 * @see org.eclipse.gmf.diadef.AdornmentKind
+	 * @see #getSourceAdornment()
+	 * @generated
+	 */
+	void setSourceAdornment(AdornmentKind value);
+
+	/**
+	 * Returns the value of the '<em><b>Target Adornment</b></em>' attribute.
+	 * The literals are from the enumeration {@link org.eclipse.gmf.diadef.AdornmentKind}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Target Adornment</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Target Adornment</em>' attribute.
+	 * @see org.eclipse.gmf.diadef.AdornmentKind
+	 * @see #setTargetAdornment(AdornmentKind)
+	 * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getConnection_TargetAdornment()
+	 * @model
+	 * @generated
+	 */
+	AdornmentKind getTargetAdornment();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.diadef.Connection#getTargetAdornment <em>Target Adornment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Target Adornment</em>' attribute.
+	 * @see org.eclipse.gmf.diadef.AdornmentKind
+	 * @see #getTargetAdornment()
+	 * @generated
+	 */
+	void setTargetAdornment(AdornmentKind value);
+
+} // Connection
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/DiagramDefinitionFactory.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/DiagramDefinitionFactory.java
new file mode 100644
index 000000000..1a50358ea
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/DiagramDefinitionFactory.java
@@ -0,0 +1,82 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage
+ * @generated
+ */
+public interface DiagramDefinitionFactory extends EFactory{
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	DiagramDefinitionFactory eINSTANCE = new org.eclipse.gmf.diadef.impl.DiagramDefinitionFactoryImpl();
+
+	/**
+	 * Returns a new object of class '<em>Node</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Node</em>'.
+	 * @generated
+	 */
+	Node createNode();
+
+	/**
+	 * Returns a new object of class '<em>Compartment</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Compartment</em>'.
+	 * @generated
+	 */
+	Compartment createCompartment();
+
+	/**
+	 * Returns a new object of class '<em>Connection</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Connection</em>'.
+	 * @generated
+	 */
+	Connection createConnection();
+
+	/**
+	 * Returns a new object of class '<em>Canvas</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Canvas</em>'.
+	 * @generated
+	 */
+	Canvas createCanvas();
+
+	/**
+	 * Returns a new object of class '<em>Run Time Property</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Run Time Property</em>'.
+	 * @generated
+	 */
+	RunTimeProperty createRunTimeProperty();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	DiagramDefinitionPackage getDiagramDefinitionPackage();
+
+} //DiagramDefinitionFactory
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/DiagramDefinitionPackage.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/DiagramDefinitionPackage.java
new file mode 100644
index 000000000..dd41f84a2
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/DiagramDefinitionPackage.java
@@ -0,0 +1,876 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.gmf.diadef.DiagramDefinitionFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface DiagramDefinitionPackage extends EPackage{
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "diadef";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/gmf/2005/DiagramDefinition";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "diadef";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	DiagramDefinitionPackage eINSTANCE = org.eclipse.gmf.diadef.impl.DiagramDefinitionPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.gmf.diadef.impl.IdentityImpl <em>Identity</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.gmf.diadef.impl.IdentityImpl
+	 * @see org.eclipse.gmf.diadef.impl.DiagramDefinitionPackageImpl#getIdentity()
+	 * @generated
+	 */
+	int IDENTITY = 6;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IDENTITY__NAME = 0;
+
+	/**
+	 * The number of structural features of the the '<em>Identity</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IDENTITY_FEATURE_COUNT = 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.gmf.diadef.impl.CommonBaseImpl <em>Common Base</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.gmf.diadef.impl.CommonBaseImpl
+	 * @see org.eclipse.gmf.diadef.impl.DiagramDefinitionPackageImpl#getCommonBase()
+	 * @generated
+	 */
+	int COMMON_BASE = 7;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMON_BASE__NAME = IDENTITY__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMON_BASE__PROPERTIES = IDENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the the '<em>Common Base</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMON_BASE_FEATURE_COUNT = IDENTITY_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.gmf.diadef.impl.DiagramElementImpl <em>Diagram Element</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.gmf.diadef.impl.DiagramElementImpl
+	 * @see org.eclipse.gmf.diadef.impl.DiagramDefinitionPackageImpl#getDiagramElement()
+	 * @generated
+	 */
+	int DIAGRAM_ELEMENT = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DIAGRAM_ELEMENT__NAME = COMMON_BASE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DIAGRAM_ELEMENT__PROPERTIES = COMMON_BASE__PROPERTIES;
+
+	/**
+	 * The feature id for the '<em><b>Needs Tool</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DIAGRAM_ELEMENT__NEEDS_TOOL = COMMON_BASE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Tool Group ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DIAGRAM_ELEMENT__TOOL_GROUP_ID = COMMON_BASE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Small Icon Path</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DIAGRAM_ELEMENT__SMALL_ICON_PATH = COMMON_BASE_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Large Icon Path</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DIAGRAM_ELEMENT__LARGE_ICON_PATH = COMMON_BASE_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the the '<em>Diagram Element</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DIAGRAM_ELEMENT_FEATURE_COUNT = COMMON_BASE_FEATURE_COUNT + 4;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.gmf.diadef.impl.NodeImpl <em>Node</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.gmf.diadef.impl.NodeImpl
+	 * @see org.eclipse.gmf.diadef.impl.DiagramDefinitionPackageImpl#getNode()
+	 * @generated
+	 */
+	int NODE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__NAME = DIAGRAM_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__PROPERTIES = DIAGRAM_ELEMENT__PROPERTIES;
+
+	/**
+	 * The feature id for the '<em><b>Needs Tool</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__NEEDS_TOOL = DIAGRAM_ELEMENT__NEEDS_TOOL;
+
+	/**
+	 * The feature id for the '<em><b>Tool Group ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__TOOL_GROUP_ID = DIAGRAM_ELEMENT__TOOL_GROUP_ID;
+
+	/**
+	 * The feature id for the '<em><b>Small Icon Path</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__SMALL_ICON_PATH = DIAGRAM_ELEMENT__SMALL_ICON_PATH;
+
+	/**
+	 * The feature id for the '<em><b>Large Icon Path</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__LARGE_ICON_PATH = DIAGRAM_ELEMENT__LARGE_ICON_PATH;
+
+	/**
+	 * The feature id for the '<em><b>Max Width</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__MAX_WIDTH = DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Max Height</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__MAX_HEIGHT = DIAGRAM_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Default Width</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__DEFAULT_WIDTH = DIAGRAM_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Default Height</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__DEFAULT_HEIGHT = DIAGRAM_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Compartments</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__COMPARTMENTS = DIAGRAM_ELEMENT_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of structural features of the the '<em>Node</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE_FEATURE_COUNT = DIAGRAM_ELEMENT_FEATURE_COUNT + 5;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.gmf.diadef.impl.CompartmentImpl <em>Compartment</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.gmf.diadef.impl.CompartmentImpl
+	 * @see org.eclipse.gmf.diadef.impl.DiagramDefinitionPackageImpl#getCompartment()
+	 * @generated
+	 */
+	int COMPARTMENT = 2;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMPARTMENT__NAME = IDENTITY__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Collapsible</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMPARTMENT__COLLAPSIBLE = IDENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Needs Title</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMPARTMENT__NEEDS_TITLE = IDENTITY_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the the '<em>Compartment</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMPARTMENT_FEATURE_COUNT = IDENTITY_FEATURE_COUNT + 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.gmf.diadef.impl.ConnectionImpl <em>Connection</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.gmf.diadef.impl.ConnectionImpl
+	 * @see org.eclipse.gmf.diadef.impl.DiagramDefinitionPackageImpl#getConnection()
+	 * @generated
+	 */
+	int CONNECTION = 3;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONNECTION__NAME = DIAGRAM_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONNECTION__PROPERTIES = DIAGRAM_ELEMENT__PROPERTIES;
+
+	/**
+	 * The feature id for the '<em><b>Needs Tool</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONNECTION__NEEDS_TOOL = DIAGRAM_ELEMENT__NEEDS_TOOL;
+
+	/**
+	 * The feature id for the '<em><b>Tool Group ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONNECTION__TOOL_GROUP_ID = DIAGRAM_ELEMENT__TOOL_GROUP_ID;
+
+	/**
+	 * The feature id for the '<em><b>Small Icon Path</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONNECTION__SMALL_ICON_PATH = DIAGRAM_ELEMENT__SMALL_ICON_PATH;
+
+	/**
+	 * The feature id for the '<em><b>Large Icon Path</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONNECTION__LARGE_ICON_PATH = DIAGRAM_ELEMENT__LARGE_ICON_PATH;
+
+	/**
+	 * The feature id for the '<em><b>Line Kind</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONNECTION__LINE_KIND = DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Source Adornment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONNECTION__SOURCE_ADORNMENT = DIAGRAM_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Target Adornment</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONNECTION__TARGET_ADORNMENT = DIAGRAM_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the the '<em>Connection</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONNECTION_FEATURE_COUNT = DIAGRAM_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.gmf.diadef.impl.CanvasImpl <em>Canvas</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.gmf.diadef.impl.CanvasImpl
+	 * @see org.eclipse.gmf.diadef.impl.DiagramDefinitionPackageImpl#getCanvas()
+	 * @generated
+	 */
+	int CANVAS = 4;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CANVAS__NAME = COMMON_BASE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CANVAS__PROPERTIES = COMMON_BASE__PROPERTIES;
+
+	/**
+	 * The feature id for the '<em><b>Nodes</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CANVAS__NODES = COMMON_BASE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Links</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CANVAS__LINKS = COMMON_BASE_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the the '<em>Canvas</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CANVAS_FEATURE_COUNT = COMMON_BASE_FEATURE_COUNT + 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.gmf.diadef.impl.RunTimePropertyImpl <em>Run Time Property</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.gmf.diadef.impl.RunTimePropertyImpl
+	 * @see org.eclipse.gmf.diadef.impl.DiagramDefinitionPackageImpl#getRunTimeProperty()
+	 * @generated
+	 */
+	int RUN_TIME_PROPERTY = 5;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RUN_TIME_PROPERTY__NAME = IDENTITY__NAME;
+
+	/**
+	 * The number of structural features of the the '<em>Run Time Property</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RUN_TIME_PROPERTY_FEATURE_COUNT = IDENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.gmf.diadef.LineKind <em>Line Kind</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.gmf.diadef.LineKind
+	 * @see org.eclipse.gmf.diadef.impl.DiagramDefinitionPackageImpl#getLineKind()
+	 * @generated
+	 */
+	int LINE_KIND = 8;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.gmf.diadef.AdornmentKind <em>Adornment Kind</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.gmf.diadef.AdornmentKind
+	 * @see org.eclipse.gmf.diadef.impl.DiagramDefinitionPackageImpl#getAdornmentKind()
+	 * @generated
+	 */
+	int ADORNMENT_KIND = 9;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.gmf.diadef.DiagramElement <em>Diagram Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Diagram Element</em>'.
+	 * @see org.eclipse.gmf.diadef.DiagramElement
+	 * @generated
+	 */
+	EClass getDiagramElement();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.diadef.DiagramElement#isNeedsTool <em>Needs Tool</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Needs Tool</em>'.
+	 * @see org.eclipse.gmf.diadef.DiagramElement#isNeedsTool()
+	 * @see #getDiagramElement()
+	 * @generated
+	 */
+	EAttribute getDiagramElement_NeedsTool();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.diadef.DiagramElement#getToolGroupID <em>Tool Group ID</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Tool Group ID</em>'.
+	 * @see org.eclipse.gmf.diadef.DiagramElement#getToolGroupID()
+	 * @see #getDiagramElement()
+	 * @generated
+	 */
+	EAttribute getDiagramElement_ToolGroupID();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.diadef.DiagramElement#getSmallIconPath <em>Small Icon Path</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Small Icon Path</em>'.
+	 * @see org.eclipse.gmf.diadef.DiagramElement#getSmallIconPath()
+	 * @see #getDiagramElement()
+	 * @generated
+	 */
+	EAttribute getDiagramElement_SmallIconPath();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.diadef.DiagramElement#getLargeIconPath <em>Large Icon Path</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Large Icon Path</em>'.
+	 * @see org.eclipse.gmf.diadef.DiagramElement#getLargeIconPath()
+	 * @see #getDiagramElement()
+	 * @generated
+	 */
+	EAttribute getDiagramElement_LargeIconPath();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.gmf.diadef.Node <em>Node</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Node</em>'.
+	 * @see org.eclipse.gmf.diadef.Node
+	 * @generated
+	 */
+	EClass getNode();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.diadef.Node#getMaxWidth <em>Max Width</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Max Width</em>'.
+	 * @see org.eclipse.gmf.diadef.Node#getMaxWidth()
+	 * @see #getNode()
+	 * @generated
+	 */
+	EAttribute getNode_MaxWidth();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.diadef.Node#getMaxHeight <em>Max Height</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Max Height</em>'.
+	 * @see org.eclipse.gmf.diadef.Node#getMaxHeight()
+	 * @see #getNode()
+	 * @generated
+	 */
+	EAttribute getNode_MaxHeight();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.diadef.Node#getDefaultWidth <em>Default Width</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Default Width</em>'.
+	 * @see org.eclipse.gmf.diadef.Node#getDefaultWidth()
+	 * @see #getNode()
+	 * @generated
+	 */
+	EAttribute getNode_DefaultWidth();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.diadef.Node#getDefaultHeight <em>Default Height</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Default Height</em>'.
+	 * @see org.eclipse.gmf.diadef.Node#getDefaultHeight()
+	 * @see #getNode()
+	 * @generated
+	 */
+	EAttribute getNode_DefaultHeight();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmf.diadef.Node#getCompartments <em>Compartments</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Compartments</em>'.
+	 * @see org.eclipse.gmf.diadef.Node#getCompartments()
+	 * @see #getNode()
+	 * @generated
+	 */
+	EReference getNode_Compartments();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.gmf.diadef.Compartment <em>Compartment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Compartment</em>'.
+	 * @see org.eclipse.gmf.diadef.Compartment
+	 * @generated
+	 */
+	EClass getCompartment();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.diadef.Compartment#isCollapsible <em>Collapsible</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Collapsible</em>'.
+	 * @see org.eclipse.gmf.diadef.Compartment#isCollapsible()
+	 * @see #getCompartment()
+	 * @generated
+	 */
+	EAttribute getCompartment_Collapsible();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.diadef.Compartment#isNeedsTitle <em>Needs Title</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Needs Title</em>'.
+	 * @see org.eclipse.gmf.diadef.Compartment#isNeedsTitle()
+	 * @see #getCompartment()
+	 * @generated
+	 */
+	EAttribute getCompartment_NeedsTitle();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.gmf.diadef.Connection <em>Connection</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Connection</em>'.
+	 * @see org.eclipse.gmf.diadef.Connection
+	 * @generated
+	 */
+	EClass getConnection();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.diadef.Connection#getLineKind <em>Line Kind</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Line Kind</em>'.
+	 * @see org.eclipse.gmf.diadef.Connection#getLineKind()
+	 * @see #getConnection()
+	 * @generated
+	 */
+	EAttribute getConnection_LineKind();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.diadef.Connection#getSourceAdornment <em>Source Adornment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Source Adornment</em>'.
+	 * @see org.eclipse.gmf.diadef.Connection#getSourceAdornment()
+	 * @see #getConnection()
+	 * @generated
+	 */
+	EAttribute getConnection_SourceAdornment();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.diadef.Connection#getTargetAdornment <em>Target Adornment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Target Adornment</em>'.
+	 * @see org.eclipse.gmf.diadef.Connection#getTargetAdornment()
+	 * @see #getConnection()
+	 * @generated
+	 */
+	EAttribute getConnection_TargetAdornment();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.gmf.diadef.Canvas <em>Canvas</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Canvas</em>'.
+	 * @see org.eclipse.gmf.diadef.Canvas
+	 * @generated
+	 */
+	EClass getCanvas();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmf.diadef.Canvas#getNodes <em>Nodes</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Nodes</em>'.
+	 * @see org.eclipse.gmf.diadef.Canvas#getNodes()
+	 * @see #getCanvas()
+	 * @generated
+	 */
+	EReference getCanvas_Nodes();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmf.diadef.Canvas#getLinks <em>Links</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Links</em>'.
+	 * @see org.eclipse.gmf.diadef.Canvas#getLinks()
+	 * @see #getCanvas()
+	 * @generated
+	 */
+	EReference getCanvas_Links();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.gmf.diadef.RunTimeProperty <em>Run Time Property</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Run Time Property</em>'.
+	 * @see org.eclipse.gmf.diadef.RunTimeProperty
+	 * @generated
+	 */
+	EClass getRunTimeProperty();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.gmf.diadef.Identity <em>Identity</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Identity</em>'.
+	 * @see org.eclipse.gmf.diadef.Identity
+	 * @generated
+	 */
+	EClass getIdentity();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.diadef.Identity#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see org.eclipse.gmf.diadef.Identity#getName()
+	 * @see #getIdentity()
+	 * @generated
+	 */
+	EAttribute getIdentity_Name();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.gmf.diadef.CommonBase <em>Common Base</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Common Base</em>'.
+	 * @see org.eclipse.gmf.diadef.CommonBase
+	 * @generated
+	 */
+	EClass getCommonBase();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmf.diadef.CommonBase#getProperties <em>Properties</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Properties</em>'.
+	 * @see org.eclipse.gmf.diadef.CommonBase#getProperties()
+	 * @see #getCommonBase()
+	 * @generated
+	 */
+	EReference getCommonBase_Properties();
+
+	/**
+	 * Returns the meta object for enum '{@link org.eclipse.gmf.diadef.LineKind <em>Line Kind</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Line Kind</em>'.
+	 * @see org.eclipse.gmf.diadef.LineKind
+	 * @generated
+	 */
+	EEnum getLineKind();
+
+	/**
+	 * Returns the meta object for enum '{@link org.eclipse.gmf.diadef.AdornmentKind <em>Adornment Kind</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Adornment Kind</em>'.
+	 * @see org.eclipse.gmf.diadef.AdornmentKind
+	 * @generated
+	 */
+	EEnum getAdornmentKind();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	DiagramDefinitionFactory getDiagramDefinitionFactory();
+
+} //DiagramDefinitionPackage
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/DiagramElement.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/DiagramElement.java
new file mode 100644
index 000000000..91853a6e3
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/DiagramElement.java
@@ -0,0 +1,135 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Diagram Element</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.gmf.diadef.DiagramElement#isNeedsTool <em>Needs Tool</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.DiagramElement#getToolGroupID <em>Tool Group ID</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.DiagramElement#getSmallIconPath <em>Small Icon Path</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.DiagramElement#getLargeIconPath <em>Large Icon Path</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getDiagramElement()
+ * @model abstract="true"
+ * @generated
+ */
+public interface DiagramElement extends CommonBase{
+	/**
+	 * Returns the value of the '<em><b>Needs Tool</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Needs Tool</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Needs Tool</em>' attribute.
+	 * @see #setNeedsTool(boolean)
+	 * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getDiagramElement_NeedsTool()
+	 * @model default="true"
+	 * @generated
+	 */
+	boolean isNeedsTool();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.diadef.DiagramElement#isNeedsTool <em>Needs Tool</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Needs Tool</em>' attribute.
+	 * @see #isNeedsTool()
+	 * @generated
+	 */
+	void setNeedsTool(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Tool Group ID</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Tool Group ID</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Tool Group ID</em>' attribute.
+	 * @see #setToolGroupID(String)
+	 * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getDiagramElement_ToolGroupID()
+	 * @model
+	 * @generated
+	 */
+	String getToolGroupID();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.diadef.DiagramElement#getToolGroupID <em>Tool Group ID</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Tool Group ID</em>' attribute.
+	 * @see #getToolGroupID()
+	 * @generated
+	 */
+	void setToolGroupID(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Small Icon Path</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Small Icon Path</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Small Icon Path</em>' attribute.
+	 * @see #setSmallIconPath(String)
+	 * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getDiagramElement_SmallIconPath()
+	 * @model
+	 * @generated
+	 */
+	String getSmallIconPath();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.diadef.DiagramElement#getSmallIconPath <em>Small Icon Path</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Small Icon Path</em>' attribute.
+	 * @see #getSmallIconPath()
+	 * @generated
+	 */
+	void setSmallIconPath(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Large Icon Path</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Large Icon Path</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Large Icon Path</em>' attribute.
+	 * @see #setLargeIconPath(String)
+	 * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getDiagramElement_LargeIconPath()
+	 * @model
+	 * @generated
+	 */
+	String getLargeIconPath();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.diadef.DiagramElement#getLargeIconPath <em>Large Icon Path</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Large Icon Path</em>' attribute.
+	 * @see #getLargeIconPath()
+	 * @generated
+	 */
+	void setLargeIconPath(String value);
+
+} // DiagramElement
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/Identity.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/Identity.java
new file mode 100644
index 000000000..0083f0aa7
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/Identity.java
@@ -0,0 +1,54 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Identity</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.gmf.diadef.Identity#getName <em>Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getIdentity()
+ * @model abstract="true"
+ * @generated
+ */
+public interface Identity extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getIdentity_Name()
+	 * @model id="true" required="true"
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.diadef.Identity#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+} // Identity
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/LineKind.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/LineKind.java
new file mode 100644
index 000000000..f683a8cd8
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/LineKind.java
@@ -0,0 +1,162 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.AbstractEnumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Line Kind</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getLineKind()
+ * @model
+ * @generated
+ */
+public final class LineKind extends AbstractEnumerator {
+	/**
+	 * The '<em><b>SOLID</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>SOLID</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #SOLID_LITERAL
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int SOLID = 0;
+
+	/**
+	 * The '<em><b>DOT</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>DOT</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #DOT_LITERAL
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int DOT = 1;
+
+	/**
+	 * The '<em><b>DASH</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>DASH</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #DASH_LITERAL
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int DASH = 2;
+
+	/**
+	 * The '<em><b>SOLID</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #SOLID
+	 * @generated
+	 * @ordered
+	 */
+	public static final LineKind SOLID_LITERAL = new LineKind(SOLID, "SOLID");
+
+	/**
+	 * The '<em><b>DOT</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #DOT
+	 * @generated
+	 * @ordered
+	 */
+	public static final LineKind DOT_LITERAL = new LineKind(DOT, "DOT");
+
+	/**
+	 * The '<em><b>DASH</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #DASH
+	 * @generated
+	 * @ordered
+	 */
+	public static final LineKind DASH_LITERAL = new LineKind(DASH, "DASH");
+
+	/**
+	 * An array of all the '<em><b>Line Kind</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final LineKind[] VALUES_ARRAY =
+		new LineKind[] {
+			SOLID_LITERAL,
+			DOT_LITERAL,
+			DASH_LITERAL,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Line Kind</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Line Kind</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static LineKind get(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			LineKind result = VALUES_ARRAY[i];
+			if (result.toString().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Line Kind</b></em>' literal with the specified value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static LineKind get(int value) {
+		switch (value) {
+			case SOLID: return SOLID_LITERAL;
+			case DOT: return DOT_LITERAL;
+			case DASH: return DASH_LITERAL;
+		}
+		return null;	
+	}
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private LineKind(int value, String name) {
+		super(value, name);
+	}
+
+} //LineKind
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/Node.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/Node.java
new file mode 100644
index 000000000..d87e31373
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/Node.java
@@ -0,0 +1,152 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Node</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.gmf.diadef.Node#getMaxWidth <em>Max Width</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.Node#getMaxHeight <em>Max Height</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.Node#getDefaultWidth <em>Default Width</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.Node#getDefaultHeight <em>Default Height</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.Node#getCompartments <em>Compartments</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getNode()
+ * @model
+ * @generated
+ */
+public interface Node extends DiagramElement {
+	/**
+	 * Returns the value of the '<em><b>Max Width</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Max Width</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Max Width</em>' attribute.
+	 * @see #setMaxWidth(int)
+	 * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getNode_MaxWidth()
+	 * @model
+	 * @generated
+	 */
+	int getMaxWidth();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.diadef.Node#getMaxWidth <em>Max Width</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Max Width</em>' attribute.
+	 * @see #getMaxWidth()
+	 * @generated
+	 */
+	void setMaxWidth(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Max Height</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Max Height</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Max Height</em>' attribute.
+	 * @see #setMaxHeight(int)
+	 * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getNode_MaxHeight()
+	 * @model
+	 * @generated
+	 */
+	int getMaxHeight();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.diadef.Node#getMaxHeight <em>Max Height</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Max Height</em>' attribute.
+	 * @see #getMaxHeight()
+	 * @generated
+	 */
+	void setMaxHeight(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Default Width</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Default Width</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Default Width</em>' attribute.
+	 * @see #setDefaultWidth(int)
+	 * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getNode_DefaultWidth()
+	 * @model
+	 * @generated
+	 */
+	int getDefaultWidth();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.diadef.Node#getDefaultWidth <em>Default Width</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Default Width</em>' attribute.
+	 * @see #getDefaultWidth()
+	 * @generated
+	 */
+	void setDefaultWidth(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Default Height</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Default Height</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Default Height</em>' attribute.
+	 * @see #setDefaultHeight(int)
+	 * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getNode_DefaultHeight()
+	 * @model
+	 * @generated
+	 */
+	int getDefaultHeight();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.gmf.diadef.Node#getDefaultHeight <em>Default Height</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Default Height</em>' attribute.
+	 * @see #getDefaultHeight()
+	 * @generated
+	 */
+	void setDefaultHeight(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Compartments</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.gmf.diadef.Compartment}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Compartments</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Compartments</em>' containment reference list.
+	 * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getNode_Compartments()
+	 * @model type="org.eclipse.gmf.diadef.Compartment" containment="true"
+	 * @generated
+	 */
+	EList getCompartments();
+
+} // Node
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/RunTimeProperty.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/RunTimeProperty.java
new file mode 100644
index 000000000..4d7eab99c
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/RunTimeProperty.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Run Time Property</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#getRunTimeProperty()
+ * @model
+ * @generated
+ */
+public interface RunTimeProperty extends Identity {
+} // RunTimeProperty
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/CanvasImpl.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/CanvasImpl.java
new file mode 100644
index 000000000..a86361bb5
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/CanvasImpl.java
@@ -0,0 +1,208 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.gmf.diadef.Canvas;
+import org.eclipse.gmf.diadef.Connection;
+import org.eclipse.gmf.diadef.DiagramDefinitionPackage;
+import org.eclipse.gmf.diadef.Node;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Canvas</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.gmf.diadef.impl.CanvasImpl#getNodes <em>Nodes</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.impl.CanvasImpl#getLinks <em>Links</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class CanvasImpl extends CommonBaseImpl implements Canvas {
+	/**
+	 * The cached value of the '{@link #getNodes() <em>Nodes</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNodes()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList nodes = null;
+
+	/**
+	 * The cached value of the '{@link #getLinks() <em>Links</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLinks()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList links = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CanvasImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return DiagramDefinitionPackage.eINSTANCE.getCanvas();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList getNodes() {
+		if (nodes == null) {
+			nodes = new EObjectContainmentEList(Node.class, this, DiagramDefinitionPackage.CANVAS__NODES);
+		}
+		return nodes;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList getLinks() {
+		if (links == null) {
+			links = new EObjectContainmentEList(Connection.class, this, DiagramDefinitionPackage.CANVAS__LINKS);
+		}
+		return links;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
+		if (featureID >= 0) {
+			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
+				case DiagramDefinitionPackage.CANVAS__PROPERTIES:
+					return ((InternalEList)getProperties()).basicRemove(otherEnd, msgs);
+				case DiagramDefinitionPackage.CANVAS__NODES:
+					return ((InternalEList)getNodes()).basicRemove(otherEnd, msgs);
+				case DiagramDefinitionPackage.CANVAS__LINKS:
+					return ((InternalEList)getLinks()).basicRemove(otherEnd, msgs);
+				default:
+					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
+			}
+		}
+		return eBasicSetContainer(null, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.CANVAS__NAME:
+				return getName();
+			case DiagramDefinitionPackage.CANVAS__PROPERTIES:
+				return getProperties();
+			case DiagramDefinitionPackage.CANVAS__NODES:
+				return getNodes();
+			case DiagramDefinitionPackage.CANVAS__LINKS:
+				return getLinks();
+		}
+		return eDynamicGet(eFeature, resolve);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(EStructuralFeature eFeature, Object newValue) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.CANVAS__NAME:
+				setName((String)newValue);
+				return;
+			case DiagramDefinitionPackage.CANVAS__PROPERTIES:
+				getProperties().clear();
+				getProperties().addAll((Collection)newValue);
+				return;
+			case DiagramDefinitionPackage.CANVAS__NODES:
+				getNodes().clear();
+				getNodes().addAll((Collection)newValue);
+				return;
+			case DiagramDefinitionPackage.CANVAS__LINKS:
+				getLinks().clear();
+				getLinks().addAll((Collection)newValue);
+				return;
+		}
+		eDynamicSet(eFeature, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(EStructuralFeature eFeature) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.CANVAS__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.CANVAS__PROPERTIES:
+				getProperties().clear();
+				return;
+			case DiagramDefinitionPackage.CANVAS__NODES:
+				getNodes().clear();
+				return;
+			case DiagramDefinitionPackage.CANVAS__LINKS:
+				getLinks().clear();
+				return;
+		}
+		eDynamicUnset(eFeature);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(EStructuralFeature eFeature) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.CANVAS__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case DiagramDefinitionPackage.CANVAS__PROPERTIES:
+				return properties != null && !properties.isEmpty();
+			case DiagramDefinitionPackage.CANVAS__NODES:
+				return nodes != null && !nodes.isEmpty();
+			case DiagramDefinitionPackage.CANVAS__LINKS:
+				return links != null && !links.isEmpty();
+		}
+		return eDynamicIsSet(eFeature);
+	}
+
+} //CanvasImpl
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/CommonBaseImpl.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/CommonBaseImpl.java
new file mode 100644
index 000000000..d24b2ff95
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/CommonBaseImpl.java
@@ -0,0 +1,158 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.gmf.diadef.CommonBase;
+import org.eclipse.gmf.diadef.DiagramDefinitionPackage;
+import org.eclipse.gmf.diadef.RunTimeProperty;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Common Base</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.gmf.diadef.impl.CommonBaseImpl#getProperties <em>Properties</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class CommonBaseImpl extends IdentityImpl implements CommonBase {
+	/**
+	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getProperties()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList properties = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CommonBaseImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return DiagramDefinitionPackage.eINSTANCE.getCommonBase();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList getProperties() {
+		if (properties == null) {
+			properties = new EObjectContainmentEList(RunTimeProperty.class, this, DiagramDefinitionPackage.COMMON_BASE__PROPERTIES);
+		}
+		return properties;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
+		if (featureID >= 0) {
+			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
+				case DiagramDefinitionPackage.COMMON_BASE__PROPERTIES:
+					return ((InternalEList)getProperties()).basicRemove(otherEnd, msgs);
+				default:
+					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
+			}
+		}
+		return eBasicSetContainer(null, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.COMMON_BASE__NAME:
+				return getName();
+			case DiagramDefinitionPackage.COMMON_BASE__PROPERTIES:
+				return getProperties();
+		}
+		return eDynamicGet(eFeature, resolve);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(EStructuralFeature eFeature, Object newValue) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.COMMON_BASE__NAME:
+				setName((String)newValue);
+				return;
+			case DiagramDefinitionPackage.COMMON_BASE__PROPERTIES:
+				getProperties().clear();
+				getProperties().addAll((Collection)newValue);
+				return;
+		}
+		eDynamicSet(eFeature, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(EStructuralFeature eFeature) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.COMMON_BASE__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.COMMON_BASE__PROPERTIES:
+				getProperties().clear();
+				return;
+		}
+		eDynamicUnset(eFeature);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(EStructuralFeature eFeature) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.COMMON_BASE__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case DiagramDefinitionPackage.COMMON_BASE__PROPERTIES:
+				return properties != null && !properties.isEmpty();
+		}
+		return eDynamicIsSet(eFeature);
+	}
+
+} //CommonBaseImpl
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/CompartmentImpl.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/CompartmentImpl.java
new file mode 100644
index 000000000..0b1a8d879
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/CompartmentImpl.java
@@ -0,0 +1,222 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.gmf.diadef.Compartment;
+import org.eclipse.gmf.diadef.DiagramDefinitionPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Compartment</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.gmf.diadef.impl.CompartmentImpl#isCollapsible <em>Collapsible</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.impl.CompartmentImpl#isNeedsTitle <em>Needs Title</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class CompartmentImpl extends IdentityImpl implements Compartment {
+	/**
+	 * The default value of the '{@link #isCollapsible() <em>Collapsible</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isCollapsible()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean COLLAPSIBLE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isCollapsible() <em>Collapsible</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isCollapsible()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean collapsible = COLLAPSIBLE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isNeedsTitle() <em>Needs Title</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isNeedsTitle()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean NEEDS_TITLE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isNeedsTitle() <em>Needs Title</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isNeedsTitle()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean needsTitle = NEEDS_TITLE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CompartmentImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return DiagramDefinitionPackage.eINSTANCE.getCompartment();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isCollapsible() {
+		return collapsible;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCollapsible(boolean newCollapsible) {
+		boolean oldCollapsible = collapsible;
+		collapsible = newCollapsible;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DiagramDefinitionPackage.COMPARTMENT__COLLAPSIBLE, oldCollapsible, collapsible));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isNeedsTitle() {
+		return needsTitle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setNeedsTitle(boolean newNeedsTitle) {
+		boolean oldNeedsTitle = needsTitle;
+		needsTitle = newNeedsTitle;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DiagramDefinitionPackage.COMPARTMENT__NEEDS_TITLE, oldNeedsTitle, needsTitle));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.COMPARTMENT__NAME:
+				return getName();
+			case DiagramDefinitionPackage.COMPARTMENT__COLLAPSIBLE:
+				return isCollapsible() ? Boolean.TRUE : Boolean.FALSE;
+			case DiagramDefinitionPackage.COMPARTMENT__NEEDS_TITLE:
+				return isNeedsTitle() ? Boolean.TRUE : Boolean.FALSE;
+		}
+		return eDynamicGet(eFeature, resolve);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(EStructuralFeature eFeature, Object newValue) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.COMPARTMENT__NAME:
+				setName((String)newValue);
+				return;
+			case DiagramDefinitionPackage.COMPARTMENT__COLLAPSIBLE:
+				setCollapsible(((Boolean)newValue).booleanValue());
+				return;
+			case DiagramDefinitionPackage.COMPARTMENT__NEEDS_TITLE:
+				setNeedsTitle(((Boolean)newValue).booleanValue());
+				return;
+		}
+		eDynamicSet(eFeature, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(EStructuralFeature eFeature) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.COMPARTMENT__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.COMPARTMENT__COLLAPSIBLE:
+				setCollapsible(COLLAPSIBLE_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.COMPARTMENT__NEEDS_TITLE:
+				setNeedsTitle(NEEDS_TITLE_EDEFAULT);
+				return;
+		}
+		eDynamicUnset(eFeature);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(EStructuralFeature eFeature) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.COMPARTMENT__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case DiagramDefinitionPackage.COMPARTMENT__COLLAPSIBLE:
+				return collapsible != COLLAPSIBLE_EDEFAULT;
+			case DiagramDefinitionPackage.COMPARTMENT__NEEDS_TITLE:
+				return needsTitle != NEEDS_TITLE_EDEFAULT;
+		}
+		return eDynamicIsSet(eFeature);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (collapsible: ");
+		result.append(collapsible);
+		result.append(", needsTitle: ");
+		result.append(needsTitle);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CompartmentImpl
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/ConnectionImpl.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/ConnectionImpl.java
new file mode 100644
index 000000000..7a3694c3f
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/ConnectionImpl.java
@@ -0,0 +1,351 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.gmf.diadef.AdornmentKind;
+import org.eclipse.gmf.diadef.Connection;
+import org.eclipse.gmf.diadef.DiagramDefinitionPackage;
+import org.eclipse.gmf.diadef.LineKind;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Connection</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.gmf.diadef.impl.ConnectionImpl#getLineKind <em>Line Kind</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.impl.ConnectionImpl#getSourceAdornment <em>Source Adornment</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.impl.ConnectionImpl#getTargetAdornment <em>Target Adornment</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ConnectionImpl extends DiagramElementImpl implements Connection {
+	/**
+	 * The default value of the '{@link #getLineKind() <em>Line Kind</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLineKind()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final LineKind LINE_KIND_EDEFAULT = LineKind.SOLID_LITERAL;
+
+	/**
+	 * The cached value of the '{@link #getLineKind() <em>Line Kind</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLineKind()
+	 * @generated
+	 * @ordered
+	 */
+	protected LineKind lineKind = LINE_KIND_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getSourceAdornment() <em>Source Adornment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSourceAdornment()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final AdornmentKind SOURCE_ADORNMENT_EDEFAULT = AdornmentKind.NONE_LITERAL;
+
+	/**
+	 * The cached value of the '{@link #getSourceAdornment() <em>Source Adornment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSourceAdornment()
+	 * @generated
+	 * @ordered
+	 */
+	protected AdornmentKind sourceAdornment = SOURCE_ADORNMENT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getTargetAdornment() <em>Target Adornment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTargetAdornment()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final AdornmentKind TARGET_ADORNMENT_EDEFAULT = AdornmentKind.NONE_LITERAL;
+
+	/**
+	 * The cached value of the '{@link #getTargetAdornment() <em>Target Adornment</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTargetAdornment()
+	 * @generated
+	 * @ordered
+	 */
+	protected AdornmentKind targetAdornment = TARGET_ADORNMENT_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ConnectionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return DiagramDefinitionPackage.eINSTANCE.getConnection();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public LineKind getLineKind() {
+		return lineKind;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLineKind(LineKind newLineKind) {
+		LineKind oldLineKind = lineKind;
+		lineKind = newLineKind == null ? LINE_KIND_EDEFAULT : newLineKind;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DiagramDefinitionPackage.CONNECTION__LINE_KIND, oldLineKind, lineKind));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdornmentKind getSourceAdornment() {
+		return sourceAdornment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSourceAdornment(AdornmentKind newSourceAdornment) {
+		AdornmentKind oldSourceAdornment = sourceAdornment;
+		sourceAdornment = newSourceAdornment == null ? SOURCE_ADORNMENT_EDEFAULT : newSourceAdornment;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DiagramDefinitionPackage.CONNECTION__SOURCE_ADORNMENT, oldSourceAdornment, sourceAdornment));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdornmentKind getTargetAdornment() {
+		return targetAdornment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTargetAdornment(AdornmentKind newTargetAdornment) {
+		AdornmentKind oldTargetAdornment = targetAdornment;
+		targetAdornment = newTargetAdornment == null ? TARGET_ADORNMENT_EDEFAULT : newTargetAdornment;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DiagramDefinitionPackage.CONNECTION__TARGET_ADORNMENT, oldTargetAdornment, targetAdornment));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
+		if (featureID >= 0) {
+			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
+				case DiagramDefinitionPackage.CONNECTION__PROPERTIES:
+					return ((InternalEList)getProperties()).basicRemove(otherEnd, msgs);
+				default:
+					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
+			}
+		}
+		return eBasicSetContainer(null, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.CONNECTION__NAME:
+				return getName();
+			case DiagramDefinitionPackage.CONNECTION__PROPERTIES:
+				return getProperties();
+			case DiagramDefinitionPackage.CONNECTION__NEEDS_TOOL:
+				return isNeedsTool() ? Boolean.TRUE : Boolean.FALSE;
+			case DiagramDefinitionPackage.CONNECTION__TOOL_GROUP_ID:
+				return getToolGroupID();
+			case DiagramDefinitionPackage.CONNECTION__SMALL_ICON_PATH:
+				return getSmallIconPath();
+			case DiagramDefinitionPackage.CONNECTION__LARGE_ICON_PATH:
+				return getLargeIconPath();
+			case DiagramDefinitionPackage.CONNECTION__LINE_KIND:
+				return getLineKind();
+			case DiagramDefinitionPackage.CONNECTION__SOURCE_ADORNMENT:
+				return getSourceAdornment();
+			case DiagramDefinitionPackage.CONNECTION__TARGET_ADORNMENT:
+				return getTargetAdornment();
+		}
+		return eDynamicGet(eFeature, resolve);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(EStructuralFeature eFeature, Object newValue) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.CONNECTION__NAME:
+				setName((String)newValue);
+				return;
+			case DiagramDefinitionPackage.CONNECTION__PROPERTIES:
+				getProperties().clear();
+				getProperties().addAll((Collection)newValue);
+				return;
+			case DiagramDefinitionPackage.CONNECTION__NEEDS_TOOL:
+				setNeedsTool(((Boolean)newValue).booleanValue());
+				return;
+			case DiagramDefinitionPackage.CONNECTION__TOOL_GROUP_ID:
+				setToolGroupID((String)newValue);
+				return;
+			case DiagramDefinitionPackage.CONNECTION__SMALL_ICON_PATH:
+				setSmallIconPath((String)newValue);
+				return;
+			case DiagramDefinitionPackage.CONNECTION__LARGE_ICON_PATH:
+				setLargeIconPath((String)newValue);
+				return;
+			case DiagramDefinitionPackage.CONNECTION__LINE_KIND:
+				setLineKind((LineKind)newValue);
+				return;
+			case DiagramDefinitionPackage.CONNECTION__SOURCE_ADORNMENT:
+				setSourceAdornment((AdornmentKind)newValue);
+				return;
+			case DiagramDefinitionPackage.CONNECTION__TARGET_ADORNMENT:
+				setTargetAdornment((AdornmentKind)newValue);
+				return;
+		}
+		eDynamicSet(eFeature, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(EStructuralFeature eFeature) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.CONNECTION__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.CONNECTION__PROPERTIES:
+				getProperties().clear();
+				return;
+			case DiagramDefinitionPackage.CONNECTION__NEEDS_TOOL:
+				setNeedsTool(NEEDS_TOOL_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.CONNECTION__TOOL_GROUP_ID:
+				setToolGroupID(TOOL_GROUP_ID_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.CONNECTION__SMALL_ICON_PATH:
+				setSmallIconPath(SMALL_ICON_PATH_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.CONNECTION__LARGE_ICON_PATH:
+				setLargeIconPath(LARGE_ICON_PATH_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.CONNECTION__LINE_KIND:
+				setLineKind(LINE_KIND_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.CONNECTION__SOURCE_ADORNMENT:
+				setSourceAdornment(SOURCE_ADORNMENT_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.CONNECTION__TARGET_ADORNMENT:
+				setTargetAdornment(TARGET_ADORNMENT_EDEFAULT);
+				return;
+		}
+		eDynamicUnset(eFeature);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(EStructuralFeature eFeature) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.CONNECTION__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case DiagramDefinitionPackage.CONNECTION__PROPERTIES:
+				return properties != null && !properties.isEmpty();
+			case DiagramDefinitionPackage.CONNECTION__NEEDS_TOOL:
+				return needsTool != NEEDS_TOOL_EDEFAULT;
+			case DiagramDefinitionPackage.CONNECTION__TOOL_GROUP_ID:
+				return TOOL_GROUP_ID_EDEFAULT == null ? toolGroupID != null : !TOOL_GROUP_ID_EDEFAULT.equals(toolGroupID);
+			case DiagramDefinitionPackage.CONNECTION__SMALL_ICON_PATH:
+				return SMALL_ICON_PATH_EDEFAULT == null ? smallIconPath != null : !SMALL_ICON_PATH_EDEFAULT.equals(smallIconPath);
+			case DiagramDefinitionPackage.CONNECTION__LARGE_ICON_PATH:
+				return LARGE_ICON_PATH_EDEFAULT == null ? largeIconPath != null : !LARGE_ICON_PATH_EDEFAULT.equals(largeIconPath);
+			case DiagramDefinitionPackage.CONNECTION__LINE_KIND:
+				return lineKind != LINE_KIND_EDEFAULT;
+			case DiagramDefinitionPackage.CONNECTION__SOURCE_ADORNMENT:
+				return sourceAdornment != SOURCE_ADORNMENT_EDEFAULT;
+			case DiagramDefinitionPackage.CONNECTION__TARGET_ADORNMENT:
+				return targetAdornment != TARGET_ADORNMENT_EDEFAULT;
+		}
+		return eDynamicIsSet(eFeature);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (lineKind: ");
+		result.append(lineKind);
+		result.append(", sourceAdornment: ");
+		result.append(sourceAdornment);
+		result.append(", targetAdornment: ");
+		result.append(targetAdornment);
+		result.append(')');
+		return result.toString();
+	}
+
+} //ConnectionImpl
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/DiagramDefinitionFactoryImpl.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/DiagramDefinitionFactoryImpl.java
new file mode 100644
index 000000000..5c8a27ac5
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/DiagramDefinitionFactoryImpl.java
@@ -0,0 +1,164 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.gmf.diadef.AdornmentKind;
+import org.eclipse.gmf.diadef.Canvas;
+import org.eclipse.gmf.diadef.Compartment;
+import org.eclipse.gmf.diadef.Connection;
+import org.eclipse.gmf.diadef.DiagramDefinitionFactory;
+import org.eclipse.gmf.diadef.DiagramDefinitionPackage;
+import org.eclipse.gmf.diadef.LineKind;
+import org.eclipse.gmf.diadef.Node;
+import org.eclipse.gmf.diadef.RunTimeProperty;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class DiagramDefinitionFactoryImpl extends EFactoryImpl implements DiagramDefinitionFactory {
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DiagramDefinitionFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case DiagramDefinitionPackage.NODE: return createNode();
+			case DiagramDefinitionPackage.COMPARTMENT: return createCompartment();
+			case DiagramDefinitionPackage.CONNECTION: return createConnection();
+			case DiagramDefinitionPackage.CANVAS: return createCanvas();
+			case DiagramDefinitionPackage.RUN_TIME_PROPERTY: return createRunTimeProperty();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object createFromString(EDataType eDataType, String initialValue) {
+		switch (eDataType.getClassifierID()) {
+			case DiagramDefinitionPackage.LINE_KIND: {
+				LineKind result = LineKind.get(initialValue);
+				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+				return result;
+			}
+			case DiagramDefinitionPackage.ADORNMENT_KIND: {
+				AdornmentKind result = AdornmentKind.get(initialValue);
+				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+				return result;
+			}
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertToString(EDataType eDataType, Object instanceValue) {
+		switch (eDataType.getClassifierID()) {
+			case DiagramDefinitionPackage.LINE_KIND:
+				return instanceValue == null ? null : instanceValue.toString();
+			case DiagramDefinitionPackage.ADORNMENT_KIND:
+				return instanceValue == null ? null : instanceValue.toString();
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Node createNode() {
+		NodeImpl node = new NodeImpl();
+		return node;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Compartment createCompartment() {
+		CompartmentImpl compartment = new CompartmentImpl();
+		return compartment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Connection createConnection() {
+		ConnectionImpl connection = new ConnectionImpl();
+		return connection;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Canvas createCanvas() {
+		CanvasImpl canvas = new CanvasImpl();
+		return canvas;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RunTimeProperty createRunTimeProperty() {
+		RunTimePropertyImpl runTimeProperty = new RunTimePropertyImpl();
+		return runTimeProperty;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DiagramDefinitionPackage getDiagramDefinitionPackage() {
+		return (DiagramDefinitionPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	public static DiagramDefinitionPackage getPackage() {
+		return DiagramDefinitionPackage.eINSTANCE;
+	}
+
+} //DiagramDefinitionFactoryImpl
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/DiagramDefinitionPackageImpl.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/DiagramDefinitionPackageImpl.java
new file mode 100644
index 000000000..274ea239a
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/DiagramDefinitionPackageImpl.java
@@ -0,0 +1,576 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.gmf.diadef.AdornmentKind;
+import org.eclipse.gmf.diadef.Canvas;
+import org.eclipse.gmf.diadef.CommonBase;
+import org.eclipse.gmf.diadef.Compartment;
+import org.eclipse.gmf.diadef.Connection;
+import org.eclipse.gmf.diadef.DiagramDefinitionFactory;
+import org.eclipse.gmf.diadef.DiagramDefinitionPackage;
+import org.eclipse.gmf.diadef.DiagramElement;
+import org.eclipse.gmf.diadef.Identity;
+import org.eclipse.gmf.diadef.LineKind;
+import org.eclipse.gmf.diadef.Node;
+import org.eclipse.gmf.diadef.RunTimeProperty;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class DiagramDefinitionPackageImpl extends EPackageImpl implements DiagramDefinitionPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass diagramElementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass nodeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass compartmentEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass connectionEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass canvasEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass runTimePropertyEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass identityEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass commonBaseEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum lineKindEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum adornmentKindEEnum = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private DiagramDefinitionPackageImpl() {
+		super(eNS_URI, DiagramDefinitionFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this
+	 * model, and for any others upon which it depends.  Simple
+	 * dependencies are satisfied by calling this method on all
+	 * dependent packages before doing anything else.  This method drives
+	 * initialization for interdependent packages directly, in parallel
+	 * with this package, itself.
+	 * <p>Of this package and its interdependencies, all packages which
+	 * have not yet been registered by their URI values are first created
+	 * and registered.  The packages are then initialized in two steps:
+	 * meta-model objects for all of the packages are created before any
+	 * are initialized, since one package's meta-model objects may refer to
+	 * those of another.
+	 * <p>Invocation of this method will not affect any packages that have
+	 * already been initialized.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static DiagramDefinitionPackage init() {
+		if (isInited) return (DiagramDefinitionPackage)EPackage.Registry.INSTANCE.getEPackage(DiagramDefinitionPackage.eNS_URI);
+
+		// Obtain or create and register package
+		DiagramDefinitionPackageImpl theDiagramDefinitionPackage = (DiagramDefinitionPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof DiagramDefinitionPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new DiagramDefinitionPackageImpl());
+
+		isInited = true;
+
+		// Create package meta-data objects
+		theDiagramDefinitionPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theDiagramDefinitionPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theDiagramDefinitionPackage.freeze();
+
+		return theDiagramDefinitionPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDiagramElement() {
+		return diagramElementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDiagramElement_NeedsTool() {
+		return (EAttribute)diagramElementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDiagramElement_ToolGroupID() {
+		return (EAttribute)diagramElementEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDiagramElement_SmallIconPath() {
+		return (EAttribute)diagramElementEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDiagramElement_LargeIconPath() {
+		return (EAttribute)diagramElementEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getNode() {
+		return nodeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getNode_MaxWidth() {
+		return (EAttribute)nodeEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getNode_MaxHeight() {
+		return (EAttribute)nodeEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getNode_DefaultWidth() {
+		return (EAttribute)nodeEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getNode_DefaultHeight() {
+		return (EAttribute)nodeEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getNode_Compartments() {
+		return (EReference)nodeEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCompartment() {
+		return compartmentEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCompartment_Collapsible() {
+		return (EAttribute)compartmentEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCompartment_NeedsTitle() {
+		return (EAttribute)compartmentEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getConnection() {
+		return connectionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getConnection_LineKind() {
+		return (EAttribute)connectionEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getConnection_SourceAdornment() {
+		return (EAttribute)connectionEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getConnection_TargetAdornment() {
+		return (EAttribute)connectionEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCanvas() {
+		return canvasEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCanvas_Nodes() {
+		return (EReference)canvasEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCanvas_Links() {
+		return (EReference)canvasEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getRunTimeProperty() {
+		return runTimePropertyEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getIdentity() {
+		return identityEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getIdentity_Name() {
+		return (EAttribute)identityEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCommonBase() {
+		return commonBaseEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCommonBase_Properties() {
+		return (EReference)commonBaseEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EEnum getLineKind() {
+		return lineKindEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EEnum getAdornmentKind() {
+		return adornmentKindEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DiagramDefinitionFactory getDiagramDefinitionFactory() {
+		return (DiagramDefinitionFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		diagramElementEClass = createEClass(DIAGRAM_ELEMENT);
+		createEAttribute(diagramElementEClass, DIAGRAM_ELEMENT__NEEDS_TOOL);
+		createEAttribute(diagramElementEClass, DIAGRAM_ELEMENT__TOOL_GROUP_ID);
+		createEAttribute(diagramElementEClass, DIAGRAM_ELEMENT__SMALL_ICON_PATH);
+		createEAttribute(diagramElementEClass, DIAGRAM_ELEMENT__LARGE_ICON_PATH);
+
+		nodeEClass = createEClass(NODE);
+		createEAttribute(nodeEClass, NODE__MAX_WIDTH);
+		createEAttribute(nodeEClass, NODE__MAX_HEIGHT);
+		createEAttribute(nodeEClass, NODE__DEFAULT_WIDTH);
+		createEAttribute(nodeEClass, NODE__DEFAULT_HEIGHT);
+		createEReference(nodeEClass, NODE__COMPARTMENTS);
+
+		compartmentEClass = createEClass(COMPARTMENT);
+		createEAttribute(compartmentEClass, COMPARTMENT__COLLAPSIBLE);
+		createEAttribute(compartmentEClass, COMPARTMENT__NEEDS_TITLE);
+
+		connectionEClass = createEClass(CONNECTION);
+		createEAttribute(connectionEClass, CONNECTION__LINE_KIND);
+		createEAttribute(connectionEClass, CONNECTION__SOURCE_ADORNMENT);
+		createEAttribute(connectionEClass, CONNECTION__TARGET_ADORNMENT);
+
+		canvasEClass = createEClass(CANVAS);
+		createEReference(canvasEClass, CANVAS__NODES);
+		createEReference(canvasEClass, CANVAS__LINKS);
+
+		runTimePropertyEClass = createEClass(RUN_TIME_PROPERTY);
+
+		identityEClass = createEClass(IDENTITY);
+		createEAttribute(identityEClass, IDENTITY__NAME);
+
+		commonBaseEClass = createEClass(COMMON_BASE);
+		createEReference(commonBaseEClass, COMMON_BASE__PROPERTIES);
+
+		// Create enums
+		lineKindEEnum = createEEnum(LINE_KIND);
+		adornmentKindEEnum = createEEnum(ADORNMENT_KIND);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Add supertypes to classes
+		diagramElementEClass.getESuperTypes().add(this.getCommonBase());
+		nodeEClass.getESuperTypes().add(this.getDiagramElement());
+		compartmentEClass.getESuperTypes().add(this.getIdentity());
+		connectionEClass.getESuperTypes().add(this.getDiagramElement());
+		canvasEClass.getESuperTypes().add(this.getCommonBase());
+		runTimePropertyEClass.getESuperTypes().add(this.getIdentity());
+		commonBaseEClass.getESuperTypes().add(this.getIdentity());
+
+		// Initialize classes and features; add operations and parameters
+		initEClass(diagramElementEClass, DiagramElement.class, "DiagramElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDiagramElement_NeedsTool(), ecorePackage.getEBoolean(), "needsTool", "true", 0, 1, DiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDiagramElement_ToolGroupID(), ecorePackage.getEString(), "toolGroupID", null, 0, 1, DiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDiagramElement_SmallIconPath(), ecorePackage.getEString(), "smallIconPath", null, 0, 1, DiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDiagramElement_LargeIconPath(), ecorePackage.getEString(), "largeIconPath", null, 0, 1, DiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(nodeEClass, Node.class, "Node", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getNode_MaxWidth(), ecorePackage.getEInt(), "maxWidth", null, 0, 1, Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getNode_MaxHeight(), ecorePackage.getEInt(), "maxHeight", null, 0, 1, Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getNode_DefaultWidth(), ecorePackage.getEInt(), "defaultWidth", null, 0, 1, Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getNode_DefaultHeight(), ecorePackage.getEInt(), "defaultHeight", null, 0, 1, Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getNode_Compartments(), this.getCompartment(), null, "compartments", null, 0, -1, Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(compartmentEClass, Compartment.class, "Compartment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCompartment_Collapsible(), ecorePackage.getEBoolean(), "collapsible", null, 0, 1, Compartment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCompartment_NeedsTitle(), ecorePackage.getEBoolean(), "needsTitle", null, 0, 1, Compartment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(connectionEClass, Connection.class, "Connection", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getConnection_LineKind(), this.getLineKind(), "lineKind", null, 1, 1, Connection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConnection_SourceAdornment(), this.getAdornmentKind(), "sourceAdornment", null, 0, 1, Connection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConnection_TargetAdornment(), this.getAdornmentKind(), "targetAdornment", null, 0, 1, Connection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(canvasEClass, Canvas.class, "Canvas", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCanvas_Nodes(), this.getNode(), null, "nodes", null, 0, -1, Canvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCanvas_Links(), this.getConnection(), null, "links", null, 0, -1, Canvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(runTimePropertyEClass, RunTimeProperty.class, "RunTimeProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(identityEClass, Identity.class, "Identity", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getIdentity_Name(), ecorePackage.getEString(), "name", null, 1, 1, Identity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(commonBaseEClass, CommonBase.class, "CommonBase", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCommonBase_Properties(), this.getRunTimeProperty(), null, "properties", null, 0, -1, CommonBase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Initialize enums and add enum literals
+		initEEnum(lineKindEEnum, LineKind.class, "LineKind");
+		addEEnumLiteral(lineKindEEnum, LineKind.SOLID_LITERAL);
+		addEEnumLiteral(lineKindEEnum, LineKind.DOT_LITERAL);
+		addEEnumLiteral(lineKindEEnum, LineKind.DASH_LITERAL);
+
+		initEEnum(adornmentKindEEnum, AdornmentKind.class, "AdornmentKind");
+		addEEnumLiteral(adornmentKindEEnum, AdornmentKind.NONE_LITERAL);
+		addEEnumLiteral(adornmentKindEEnum, AdornmentKind.OPEN_TRIANGLE_LITERAL);
+		addEEnumLiteral(adornmentKindEEnum, AdornmentKind.FILLED_TRIANGLE_LITERAL);
+		addEEnumLiteral(adornmentKindEEnum, AdornmentKind.RHOMB_LITERAL);
+		addEEnumLiteral(adornmentKindEEnum, AdornmentKind.FILLED_RHOMB_LITERAL);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} //DiagramDefinitionPackageImpl
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/DiagramElementImpl.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/DiagramElementImpl.java
new file mode 100644
index 000000000..299a99bfc
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/DiagramElementImpl.java
@@ -0,0 +1,375 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.gmf.diadef.DiagramDefinitionPackage;
+import org.eclipse.gmf.diadef.DiagramElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Diagram Element</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.gmf.diadef.impl.DiagramElementImpl#isNeedsTool <em>Needs Tool</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.impl.DiagramElementImpl#getToolGroupID <em>Tool Group ID</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.impl.DiagramElementImpl#getSmallIconPath <em>Small Icon Path</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.impl.DiagramElementImpl#getLargeIconPath <em>Large Icon Path</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class DiagramElementImpl extends CommonBaseImpl implements DiagramElement {
+	/**
+	 * The default value of the '{@link #isNeedsTool() <em>Needs Tool</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isNeedsTool()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean NEEDS_TOOL_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isNeedsTool() <em>Needs Tool</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isNeedsTool()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean needsTool = NEEDS_TOOL_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getToolGroupID() <em>Tool Group ID</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getToolGroupID()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TOOL_GROUP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getToolGroupID() <em>Tool Group ID</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getToolGroupID()
+	 * @generated
+	 * @ordered
+	 */
+	protected String toolGroupID = TOOL_GROUP_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getSmallIconPath() <em>Small Icon Path</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSmallIconPath()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SMALL_ICON_PATH_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getSmallIconPath() <em>Small Icon Path</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSmallIconPath()
+	 * @generated
+	 * @ordered
+	 */
+	protected String smallIconPath = SMALL_ICON_PATH_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getLargeIconPath() <em>Large Icon Path</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLargeIconPath()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String LARGE_ICON_PATH_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getLargeIconPath() <em>Large Icon Path</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLargeIconPath()
+	 * @generated
+	 * @ordered
+	 */
+	protected String largeIconPath = LARGE_ICON_PATH_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DiagramElementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return DiagramDefinitionPackage.eINSTANCE.getDiagramElement();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isNeedsTool() {
+		return needsTool;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setNeedsTool(boolean newNeedsTool) {
+		boolean oldNeedsTool = needsTool;
+		needsTool = newNeedsTool;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DiagramDefinitionPackage.DIAGRAM_ELEMENT__NEEDS_TOOL, oldNeedsTool, needsTool));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getToolGroupID() {
+		return toolGroupID;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setToolGroupID(String newToolGroupID) {
+		String oldToolGroupID = toolGroupID;
+		toolGroupID = newToolGroupID;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DiagramDefinitionPackage.DIAGRAM_ELEMENT__TOOL_GROUP_ID, oldToolGroupID, toolGroupID));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getSmallIconPathGen() {
+		return smallIconPath;
+	}
+
+	/**
+	 * Intentionally done for {@link #smallIconPath} only - to evaluate the approach of
+	 * default value, whether it's reasonable or not. {@link #largeIconPath} is null by default
+	 */
+	public String getSmallIconPath() {
+		String value = getSmallIconPathGen();
+		if (value == null) {
+			return "icons/small/" + getName() + ".gif";
+		}
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSmallIconPath(String newSmallIconPath) {
+		String oldSmallIconPath = smallIconPath;
+		smallIconPath = newSmallIconPath;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DiagramDefinitionPackage.DIAGRAM_ELEMENT__SMALL_ICON_PATH, oldSmallIconPath, smallIconPath));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLargeIconPath() {
+		return largeIconPath;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLargeIconPath(String newLargeIconPath) {
+		String oldLargeIconPath = largeIconPath;
+		largeIconPath = newLargeIconPath;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DiagramDefinitionPackage.DIAGRAM_ELEMENT__LARGE_ICON_PATH, oldLargeIconPath, largeIconPath));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
+		if (featureID >= 0) {
+			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
+				case DiagramDefinitionPackage.DIAGRAM_ELEMENT__PROPERTIES:
+					return ((InternalEList)getProperties()).basicRemove(otherEnd, msgs);
+				default:
+					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
+			}
+		}
+		return eBasicSetContainer(null, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__NAME:
+				return getName();
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__PROPERTIES:
+				return getProperties();
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__NEEDS_TOOL:
+				return isNeedsTool() ? Boolean.TRUE : Boolean.FALSE;
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__TOOL_GROUP_ID:
+				return getToolGroupID();
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__SMALL_ICON_PATH:
+				return getSmallIconPath();
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__LARGE_ICON_PATH:
+				return getLargeIconPath();
+		}
+		return eDynamicGet(eFeature, resolve);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(EStructuralFeature eFeature, Object newValue) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__NAME:
+				setName((String)newValue);
+				return;
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__PROPERTIES:
+				getProperties().clear();
+				getProperties().addAll((Collection)newValue);
+				return;
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__NEEDS_TOOL:
+				setNeedsTool(((Boolean)newValue).booleanValue());
+				return;
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__TOOL_GROUP_ID:
+				setToolGroupID((String)newValue);
+				return;
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__SMALL_ICON_PATH:
+				setSmallIconPath((String)newValue);
+				return;
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__LARGE_ICON_PATH:
+				setLargeIconPath((String)newValue);
+				return;
+		}
+		eDynamicSet(eFeature, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(EStructuralFeature eFeature) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__PROPERTIES:
+				getProperties().clear();
+				return;
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__NEEDS_TOOL:
+				setNeedsTool(NEEDS_TOOL_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__TOOL_GROUP_ID:
+				setToolGroupID(TOOL_GROUP_ID_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__SMALL_ICON_PATH:
+				setSmallIconPath(SMALL_ICON_PATH_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__LARGE_ICON_PATH:
+				setLargeIconPath(LARGE_ICON_PATH_EDEFAULT);
+				return;
+		}
+		eDynamicUnset(eFeature);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(EStructuralFeature eFeature) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__PROPERTIES:
+				return properties != null && !properties.isEmpty();
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__NEEDS_TOOL:
+				return needsTool != NEEDS_TOOL_EDEFAULT;
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__TOOL_GROUP_ID:
+				return TOOL_GROUP_ID_EDEFAULT == null ? toolGroupID != null : !TOOL_GROUP_ID_EDEFAULT.equals(toolGroupID);
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__SMALL_ICON_PATH:
+				return SMALL_ICON_PATH_EDEFAULT == null ? smallIconPath != null : !SMALL_ICON_PATH_EDEFAULT.equals(smallIconPath);
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__LARGE_ICON_PATH:
+				return LARGE_ICON_PATH_EDEFAULT == null ? largeIconPath != null : !LARGE_ICON_PATH_EDEFAULT.equals(largeIconPath);
+		}
+		return eDynamicIsSet(eFeature);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (needsTool: ");
+		result.append(needsTool);
+		result.append(", toolGroupID: ");
+		result.append(toolGroupID);
+		result.append(", smallIconPath: ");
+		result.append(smallIconPath);
+		result.append(", largeIconPath: ");
+		result.append(largeIconPath);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DiagramElementImpl
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/IdentityImpl.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/IdentityImpl.java
new file mode 100644
index 000000000..3a9d0db55
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/IdentityImpl.java
@@ -0,0 +1,159 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.gmf.diadef.DiagramDefinitionPackage;
+import org.eclipse.gmf.diadef.Identity;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Identity</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.gmf.diadef.impl.IdentityImpl#getName <em>Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class IdentityImpl extends EObjectImpl implements Identity {
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IdentityImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return DiagramDefinitionPackage.eINSTANCE.getIdentity();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DiagramDefinitionPackage.IDENTITY__NAME, oldName, name));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.IDENTITY__NAME:
+				return getName();
+		}
+		return eDynamicGet(eFeature, resolve);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(EStructuralFeature eFeature, Object newValue) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.IDENTITY__NAME:
+				setName((String)newValue);
+				return;
+		}
+		eDynamicSet(eFeature, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(EStructuralFeature eFeature) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.IDENTITY__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+		}
+		eDynamicUnset(eFeature);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(EStructuralFeature eFeature) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.IDENTITY__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		}
+		return eDynamicIsSet(eFeature);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (name: ");
+		result.append(name);
+		result.append(')');
+		return result.toString();
+	}
+
+} //IdentityImpl
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/NodeImpl.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/NodeImpl.java
new file mode 100644
index 000000000..ed5161b41
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/NodeImpl.java
@@ -0,0 +1,442 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.gmf.diadef.Compartment;
+import org.eclipse.gmf.diadef.DiagramDefinitionPackage;
+import org.eclipse.gmf.diadef.Node;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Node</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.gmf.diadef.impl.NodeImpl#getMaxWidth <em>Max Width</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.impl.NodeImpl#getMaxHeight <em>Max Height</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.impl.NodeImpl#getDefaultWidth <em>Default Width</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.impl.NodeImpl#getDefaultHeight <em>Default Height</em>}</li>
+ *   <li>{@link org.eclipse.gmf.diadef.impl.NodeImpl#getCompartments <em>Compartments</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class NodeImpl extends DiagramElementImpl implements Node {
+	/**
+	 * The default value of the '{@link #getMaxWidth() <em>Max Width</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMaxWidth()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int MAX_WIDTH_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getMaxWidth() <em>Max Width</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMaxWidth()
+	 * @generated
+	 * @ordered
+	 */
+	protected int maxWidth = MAX_WIDTH_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMaxHeight() <em>Max Height</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMaxHeight()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int MAX_HEIGHT_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getMaxHeight() <em>Max Height</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMaxHeight()
+	 * @generated
+	 * @ordered
+	 */
+	protected int maxHeight = MAX_HEIGHT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDefaultWidth() <em>Default Width</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDefaultWidth()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int DEFAULT_WIDTH_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getDefaultWidth() <em>Default Width</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDefaultWidth()
+	 * @generated
+	 * @ordered
+	 */
+	protected int defaultWidth = DEFAULT_WIDTH_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDefaultHeight() <em>Default Height</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDefaultHeight()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int DEFAULT_HEIGHT_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getDefaultHeight() <em>Default Height</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDefaultHeight()
+	 * @generated
+	 * @ordered
+	 */
+	protected int defaultHeight = DEFAULT_HEIGHT_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getCompartments() <em>Compartments</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCompartments()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList compartments = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NodeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return DiagramDefinitionPackage.eINSTANCE.getNode();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getMaxWidth() {
+		return maxWidth;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setMaxWidth(int newMaxWidth) {
+		int oldMaxWidth = maxWidth;
+		maxWidth = newMaxWidth;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DiagramDefinitionPackage.NODE__MAX_WIDTH, oldMaxWidth, maxWidth));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getMaxHeight() {
+		return maxHeight;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setMaxHeight(int newMaxHeight) {
+		int oldMaxHeight = maxHeight;
+		maxHeight = newMaxHeight;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DiagramDefinitionPackage.NODE__MAX_HEIGHT, oldMaxHeight, maxHeight));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getDefaultWidth() {
+		return defaultWidth;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDefaultWidth(int newDefaultWidth) {
+		int oldDefaultWidth = defaultWidth;
+		defaultWidth = newDefaultWidth;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DiagramDefinitionPackage.NODE__DEFAULT_WIDTH, oldDefaultWidth, defaultWidth));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getDefaultHeight() {
+		return defaultHeight;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDefaultHeight(int newDefaultHeight) {
+		int oldDefaultHeight = defaultHeight;
+		defaultHeight = newDefaultHeight;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DiagramDefinitionPackage.NODE__DEFAULT_HEIGHT, oldDefaultHeight, defaultHeight));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList getCompartments() {
+		if (compartments == null) {
+			compartments = new EObjectContainmentEList(Compartment.class, this, DiagramDefinitionPackage.NODE__COMPARTMENTS);
+		}
+		return compartments;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
+		if (featureID >= 0) {
+			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
+				case DiagramDefinitionPackage.NODE__PROPERTIES:
+					return ((InternalEList)getProperties()).basicRemove(otherEnd, msgs);
+				case DiagramDefinitionPackage.NODE__COMPARTMENTS:
+					return ((InternalEList)getCompartments()).basicRemove(otherEnd, msgs);
+				default:
+					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
+			}
+		}
+		return eBasicSetContainer(null, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.NODE__NAME:
+				return getName();
+			case DiagramDefinitionPackage.NODE__PROPERTIES:
+				return getProperties();
+			case DiagramDefinitionPackage.NODE__NEEDS_TOOL:
+				return isNeedsTool() ? Boolean.TRUE : Boolean.FALSE;
+			case DiagramDefinitionPackage.NODE__TOOL_GROUP_ID:
+				return getToolGroupID();
+			case DiagramDefinitionPackage.NODE__SMALL_ICON_PATH:
+				return getSmallIconPath();
+			case DiagramDefinitionPackage.NODE__LARGE_ICON_PATH:
+				return getLargeIconPath();
+			case DiagramDefinitionPackage.NODE__MAX_WIDTH:
+				return new Integer(getMaxWidth());
+			case DiagramDefinitionPackage.NODE__MAX_HEIGHT:
+				return new Integer(getMaxHeight());
+			case DiagramDefinitionPackage.NODE__DEFAULT_WIDTH:
+				return new Integer(getDefaultWidth());
+			case DiagramDefinitionPackage.NODE__DEFAULT_HEIGHT:
+				return new Integer(getDefaultHeight());
+			case DiagramDefinitionPackage.NODE__COMPARTMENTS:
+				return getCompartments();
+		}
+		return eDynamicGet(eFeature, resolve);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(EStructuralFeature eFeature, Object newValue) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.NODE__NAME:
+				setName((String)newValue);
+				return;
+			case DiagramDefinitionPackage.NODE__PROPERTIES:
+				getProperties().clear();
+				getProperties().addAll((Collection)newValue);
+				return;
+			case DiagramDefinitionPackage.NODE__NEEDS_TOOL:
+				setNeedsTool(((Boolean)newValue).booleanValue());
+				return;
+			case DiagramDefinitionPackage.NODE__TOOL_GROUP_ID:
+				setToolGroupID((String)newValue);
+				return;
+			case DiagramDefinitionPackage.NODE__SMALL_ICON_PATH:
+				setSmallIconPath((String)newValue);
+				return;
+			case DiagramDefinitionPackage.NODE__LARGE_ICON_PATH:
+				setLargeIconPath((String)newValue);
+				return;
+			case DiagramDefinitionPackage.NODE__MAX_WIDTH:
+				setMaxWidth(((Integer)newValue).intValue());
+				return;
+			case DiagramDefinitionPackage.NODE__MAX_HEIGHT:
+				setMaxHeight(((Integer)newValue).intValue());
+				return;
+			case DiagramDefinitionPackage.NODE__DEFAULT_WIDTH:
+				setDefaultWidth(((Integer)newValue).intValue());
+				return;
+			case DiagramDefinitionPackage.NODE__DEFAULT_HEIGHT:
+				setDefaultHeight(((Integer)newValue).intValue());
+				return;
+			case DiagramDefinitionPackage.NODE__COMPARTMENTS:
+				getCompartments().clear();
+				getCompartments().addAll((Collection)newValue);
+				return;
+		}
+		eDynamicSet(eFeature, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(EStructuralFeature eFeature) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.NODE__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.NODE__PROPERTIES:
+				getProperties().clear();
+				return;
+			case DiagramDefinitionPackage.NODE__NEEDS_TOOL:
+				setNeedsTool(NEEDS_TOOL_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.NODE__TOOL_GROUP_ID:
+				setToolGroupID(TOOL_GROUP_ID_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.NODE__SMALL_ICON_PATH:
+				setSmallIconPath(SMALL_ICON_PATH_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.NODE__LARGE_ICON_PATH:
+				setLargeIconPath(LARGE_ICON_PATH_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.NODE__MAX_WIDTH:
+				setMaxWidth(MAX_WIDTH_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.NODE__MAX_HEIGHT:
+				setMaxHeight(MAX_HEIGHT_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.NODE__DEFAULT_WIDTH:
+				setDefaultWidth(DEFAULT_WIDTH_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.NODE__DEFAULT_HEIGHT:
+				setDefaultHeight(DEFAULT_HEIGHT_EDEFAULT);
+				return;
+			case DiagramDefinitionPackage.NODE__COMPARTMENTS:
+				getCompartments().clear();
+				return;
+		}
+		eDynamicUnset(eFeature);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(EStructuralFeature eFeature) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.NODE__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case DiagramDefinitionPackage.NODE__PROPERTIES:
+				return properties != null && !properties.isEmpty();
+			case DiagramDefinitionPackage.NODE__NEEDS_TOOL:
+				return needsTool != NEEDS_TOOL_EDEFAULT;
+			case DiagramDefinitionPackage.NODE__TOOL_GROUP_ID:
+				return TOOL_GROUP_ID_EDEFAULT == null ? toolGroupID != null : !TOOL_GROUP_ID_EDEFAULT.equals(toolGroupID);
+			case DiagramDefinitionPackage.NODE__SMALL_ICON_PATH:
+				return SMALL_ICON_PATH_EDEFAULT == null ? smallIconPath != null : !SMALL_ICON_PATH_EDEFAULT.equals(smallIconPath);
+			case DiagramDefinitionPackage.NODE__LARGE_ICON_PATH:
+				return LARGE_ICON_PATH_EDEFAULT == null ? largeIconPath != null : !LARGE_ICON_PATH_EDEFAULT.equals(largeIconPath);
+			case DiagramDefinitionPackage.NODE__MAX_WIDTH:
+				return maxWidth != MAX_WIDTH_EDEFAULT;
+			case DiagramDefinitionPackage.NODE__MAX_HEIGHT:
+				return maxHeight != MAX_HEIGHT_EDEFAULT;
+			case DiagramDefinitionPackage.NODE__DEFAULT_WIDTH:
+				return defaultWidth != DEFAULT_WIDTH_EDEFAULT;
+			case DiagramDefinitionPackage.NODE__DEFAULT_HEIGHT:
+				return defaultHeight != DEFAULT_HEIGHT_EDEFAULT;
+			case DiagramDefinitionPackage.NODE__COMPARTMENTS:
+				return compartments != null && !compartments.isEmpty();
+		}
+		return eDynamicIsSet(eFeature);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (maxWidth: ");
+		result.append(maxWidth);
+		result.append(", maxHeight: ");
+		result.append(maxHeight);
+		result.append(", defaultWidth: ");
+		result.append(defaultWidth);
+		result.append(", defaultHeight: ");
+		result.append(defaultHeight);
+		result.append(')');
+		return result.toString();
+	}
+
+} //NodeImpl
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/RunTimePropertyImpl.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/RunTimePropertyImpl.java
new file mode 100644
index 000000000..b0d6270fe
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/impl/RunTimePropertyImpl.java
@@ -0,0 +1,96 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.diadef.DiagramDefinitionPackage;
+import org.eclipse.gmf.diadef.RunTimeProperty;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Run Time Property</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class RunTimePropertyImpl extends IdentityImpl implements RunTimeProperty {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected RunTimePropertyImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return DiagramDefinitionPackage.eINSTANCE.getRunTimeProperty();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.RUN_TIME_PROPERTY__NAME:
+				return getName();
+		}
+		return eDynamicGet(eFeature, resolve);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(EStructuralFeature eFeature, Object newValue) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.RUN_TIME_PROPERTY__NAME:
+				setName((String)newValue);
+				return;
+		}
+		eDynamicSet(eFeature, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(EStructuralFeature eFeature) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.RUN_TIME_PROPERTY__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+		}
+		eDynamicUnset(eFeature);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(EStructuralFeature eFeature) {
+		switch (eDerivedStructuralFeatureID(eFeature)) {
+			case DiagramDefinitionPackage.RUN_TIME_PROPERTY__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		}
+		return eDynamicIsSet(eFeature);
+	}
+
+} //RunTimePropertyImpl
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/util/DiagramDefinitionAdapterFactory.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/util/DiagramDefinitionAdapterFactory.java
new file mode 100644
index 000000000..6b1a81c48
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/util/DiagramDefinitionAdapterFactory.java
@@ -0,0 +1,244 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.diadef.Canvas;
+import org.eclipse.gmf.diadef.CommonBase;
+import org.eclipse.gmf.diadef.Compartment;
+import org.eclipse.gmf.diadef.Connection;
+import org.eclipse.gmf.diadef.DiagramDefinitionPackage;
+import org.eclipse.gmf.diadef.DiagramElement;
+import org.eclipse.gmf.diadef.Identity;
+import org.eclipse.gmf.diadef.Node;
+import org.eclipse.gmf.diadef.RunTimeProperty;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage
+ * @generated
+ */
+public class DiagramDefinitionAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static DiagramDefinitionPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DiagramDefinitionAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = DiagramDefinitionPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch the delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DiagramDefinitionSwitch modelSwitch =
+		new DiagramDefinitionSwitch() {
+			public Object caseDiagramElement(DiagramElement object) {
+				return createDiagramElementAdapter();
+			}
+			public Object caseNode(Node object) {
+				return createNodeAdapter();
+			}
+			public Object caseCompartment(Compartment object) {
+				return createCompartmentAdapter();
+			}
+			public Object caseConnection(Connection object) {
+				return createConnectionAdapter();
+			}
+			public Object caseCanvas(Canvas object) {
+				return createCanvasAdapter();
+			}
+			public Object caseRunTimeProperty(RunTimeProperty object) {
+				return createRunTimePropertyAdapter();
+			}
+			public Object caseIdentity(Identity object) {
+				return createIdentityAdapter();
+			}
+			public Object caseCommonBase(CommonBase object) {
+				return createCommonBaseAdapter();
+			}
+			public Object defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	public Adapter createAdapter(Notifier target) {
+		return (Adapter)modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.diadef.DiagramElement <em>Diagram Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.diadef.DiagramElement
+	 * @generated
+	 */
+	public Adapter createDiagramElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.diadef.Node <em>Node</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.diadef.Node
+	 * @generated
+	 */
+	public Adapter createNodeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.diadef.Compartment <em>Compartment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.diadef.Compartment
+	 * @generated
+	 */
+	public Adapter createCompartmentAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.diadef.Connection <em>Connection</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.diadef.Connection
+	 * @generated
+	 */
+	public Adapter createConnectionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.diadef.Canvas <em>Canvas</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.diadef.Canvas
+	 * @generated
+	 */
+	public Adapter createCanvasAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.diadef.RunTimeProperty <em>Run Time Property</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.diadef.RunTimeProperty
+	 * @generated
+	 */
+	public Adapter createRunTimePropertyAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.diadef.Identity <em>Identity</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.diadef.Identity
+	 * @generated
+	 */
+	public Adapter createIdentityAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.diadef.CommonBase <em>Common Base</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.gmf.diadef.CommonBase
+	 * @generated
+	 */
+	public Adapter createCommonBaseAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //DiagramDefinitionAdapterFactory
diff --git a/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/util/DiagramDefinitionSwitch.java b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/util/DiagramDefinitionSwitch.java
new file mode 100644
index 000000000..c463e73f4
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef/src/org/eclipse/gmf/diadef/util/DiagramDefinitionSwitch.java
@@ -0,0 +1,297 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.util;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.diadef.Canvas;
+import org.eclipse.gmf.diadef.CommonBase;
+import org.eclipse.gmf.diadef.Compartment;
+import org.eclipse.gmf.diadef.Connection;
+import org.eclipse.gmf.diadef.DiagramDefinitionPackage;
+import org.eclipse.gmf.diadef.DiagramElement;
+import org.eclipse.gmf.diadef.Identity;
+import org.eclipse.gmf.diadef.Node;
+import org.eclipse.gmf.diadef.RunTimeProperty;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.gmf.diadef.DiagramDefinitionPackage
+ * @generated
+ */
+public class DiagramDefinitionSwitch {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static DiagramDefinitionPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DiagramDefinitionSwitch() {
+		if (modelPackage == null) {
+			modelPackage = DiagramDefinitionPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	public Object doSwitch(EObject theEObject) {
+		return doSwitch(theEObject.eClass(), theEObject);
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	protected Object doSwitch(EClass theEClass, EObject theEObject) {
+		if (theEClass.eContainer() == modelPackage) {
+			return doSwitch(theEClass.getClassifierID(), theEObject);
+		}
+		else {
+			List eSuperTypes = theEClass.getESuperTypes();
+			return
+				eSuperTypes.isEmpty() ?
+					defaultCase(theEObject) :
+					doSwitch((EClass)eSuperTypes.get(0), theEObject);
+		}
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	protected Object doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT: {
+				DiagramElement diagramElement = (DiagramElement)theEObject;
+				Object result = caseDiagramElement(diagramElement);
+				if (result == null) result = caseCommonBase(diagramElement);
+				if (result == null) result = caseIdentity(diagramElement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DiagramDefinitionPackage.NODE: {
+				Node node = (Node)theEObject;
+				Object result = caseNode(node);
+				if (result == null) result = caseDiagramElement(node);
+				if (result == null) result = caseCommonBase(node);
+				if (result == null) result = caseIdentity(node);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DiagramDefinitionPackage.COMPARTMENT: {
+				Compartment compartment = (Compartment)theEObject;
+				Object result = caseCompartment(compartment);
+				if (result == null) result = caseIdentity(compartment);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DiagramDefinitionPackage.CONNECTION: {
+				Connection connection = (Connection)theEObject;
+				Object result = caseConnection(connection);
+				if (result == null) result = caseDiagramElement(connection);
+				if (result == null) result = caseCommonBase(connection);
+				if (result == null) result = caseIdentity(connection);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DiagramDefinitionPackage.CANVAS: {
+				Canvas canvas = (Canvas)theEObject;
+				Object result = caseCanvas(canvas);
+				if (result == null) result = caseCommonBase(canvas);
+				if (result == null) result = caseIdentity(canvas);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DiagramDefinitionPackage.RUN_TIME_PROPERTY: {
+				RunTimeProperty runTimeProperty = (RunTimeProperty)theEObject;
+				Object result = caseRunTimeProperty(runTimeProperty);
+				if (result == null) result = caseIdentity(runTimeProperty);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DiagramDefinitionPackage.IDENTITY: {
+				Identity identity = (Identity)theEObject;
+				Object result = caseIdentity(identity);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DiagramDefinitionPackage.COMMON_BASE: {
+				CommonBase commonBase = (CommonBase)theEObject;
+				Object result = caseCommonBase(commonBase);
+				if (result == null) result = caseIdentity(commonBase);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Diagram Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>Diagram Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseDiagramElement(DiagramElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Node</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>Node</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseNode(Node object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Compartment</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>Compartment</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseCompartment(Compartment object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Connection</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>Connection</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseConnection(Connection object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Canvas</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>Canvas</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseCanvas(Canvas object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Run Time Property</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>Run Time Property</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseRunTimeProperty(RunTimeProperty object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Identity</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>Identity</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseIdentity(Identity object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Common Base</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>Common Base</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseCommonBase(CommonBase object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	public Object defaultCase(EObject object) {
+		return null;
+	}
+
+} //DiagramDefinitionSwitch