*** empty log message ***

82 files changed, 10125 insertions, 0 deletions

diff --git a/archive/org.eclipse.gmf.diadef.edit/.classpath b/archive/org.eclipse.gmf.diadef.edit/.classpath
new file mode 100644
index 000000000..ecab266ce
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/.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.edit/.cvsignore b/archive/org.eclipse.gmf.diadef.edit/.cvsignore
new file mode 100644
index 000000000..ba077a403
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/.cvsignore
@@ -0,0 +1 @@
+bin
diff --git a/archive/org.eclipse.gmf.diadef.edit/.project b/archive/org.eclipse.gmf.diadef.edit/.project
new file mode 100644
index 000000000..473869cbe
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.gmf.diadef.edit</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.edit/META-INF/MANIFEST.MF b/archive/org.eclipse.gmf.diadef.edit/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..45f4d5750
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.gmf.diadef.edit; singleton:=true
+Bundle-Version: 1.0.0
+Bundle-Activator: org.eclipse.gmf.diadef.provider.DiagramDefEditPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.gmf.diadef.presentation,
+ org.eclipse.gmf.diadef.provider
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources;visibility:=reexport,
+ org.eclipse.gmf.diadef;visibility:=reexport,
+ org.eclipse.emf.edit;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.emf.edit.ui;visibility:=reexport,
+ org.eclipse.ui.ide;visibility:=reexport
+Eclipse-AutoStart: true
diff --git a/archive/org.eclipse.gmf.diadef.edit/build.properties b/archive/org.eclipse.gmf.diadef.edit/build.properties
new file mode 100644
index 000000000..47a68b422
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/build.properties
@@ -0,0 +1,8 @@
+bin.includes = plugin.xml,\
+               plugin.properties,\
+               icons/,\
+               META-INF/,\
+               .
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateCanvas_links_Connection.gif b/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateCanvas_links_Connection.gif
new file mode 100644
index 000000000..5f8c2018a
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateCanvas_links_Connection.gif
diff --git a/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateCanvas_nodes_Node.gif b/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateCanvas_nodes_Node.gif
new file mode 100644
index 000000000..8a4acfb07
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateCanvas_nodes_Node.gif
diff --git a/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateCommonBase_properties_RunTimeProperty.gif b/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateCommonBase_properties_RunTimeProperty.gif
new file mode 100644
index 000000000..a88072d83
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateCommonBase_properties_RunTimeProperty.gif
diff --git a/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateDiagramCanvas_links_DiagramLink.gif b/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateDiagramCanvas_links_DiagramLink.gif
new file mode 100644
index 000000000..72eb6e653
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateDiagramCanvas_links_DiagramLink.gif
diff --git a/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateDiagramCanvas_nodes_DiagramNode.gif b/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateDiagramCanvas_nodes_DiagramNode.gif
new file mode 100644
index 000000000..f4ea4b78c
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateDiagramCanvas_nodes_DiagramNode.gif
diff --git a/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateDiagramNode_compartments_Compartment.gif b/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateDiagramNode_compartments_Compartment.gif
new file mode 100644
index 000000000..b2556694e
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateDiagramNode_compartments_Compartment.gif
diff --git a/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateNode_compartments_Compartment.gif b/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateNode_compartments_Compartment.gif
new file mode 100644
index 000000000..09b8804bd
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/icons/full/ctool16/CreateNode_compartments_Compartment.gif
diff --git a/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/Canvas.gif b/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/Canvas.gif
new file mode 100644
index 000000000..b1f8afa47
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/Canvas.gif
diff --git a/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/Compartment.gif b/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/Compartment.gif
new file mode 100644
index 000000000..33854e98c
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/Compartment.gif
diff --git a/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/Connection.gif b/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/Connection.gif
new file mode 100644
index 000000000..e4b530eca
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/Connection.gif
diff --git a/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/DiagramCanvas.gif b/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/DiagramCanvas.gif
new file mode 100644
index 000000000..1e5345fb3
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/DiagramCanvas.gif
diff --git a/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/DiagramDefinitionModelFile.gif b/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/DiagramDefinitionModelFile.gif
new file mode 100644
index 000000000..b91c5dffb
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/DiagramDefinitionModelFile.gif
diff --git a/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/DiagramLink.gif b/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/DiagramLink.gif
new file mode 100644
index 000000000..c673a5200
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/DiagramLink.gif
diff --git a/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/DiagramNode.gif b/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/DiagramNode.gif
new file mode 100644
index 000000000..90d10f947
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/DiagramNode.gif
diff --git a/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/Node.gif b/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/Node.gif
new file mode 100644
index 000000000..ef56c1408
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/Node.gif
diff --git a/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/RunTimeProperty.gif b/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/RunTimeProperty.gif
new file mode 100644
index 000000000..90d10f947
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/icons/full/obj16/RunTimeProperty.gif
diff --git a/archive/org.eclipse.gmf.diadef.edit/icons/full/wizban/NewDiagramDefinition.gif b/archive/org.eclipse.gmf.diadef.edit/icons/full/wizban/NewDiagramDefinition.gif
new file mode 100644
index 000000000..9e8865f86
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/icons/full/wizban/NewDiagramDefinition.gif
diff --git a/archive/org.eclipse.gmf.diadef.edit/plugin.properties b/archive/org.eclipse.gmf.diadef.edit/plugin.properties
new file mode 100644
index 000000000..8a66d82ad
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/plugin.properties
@@ -0,0 +1,101 @@
+# <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 = Diagram Definition Edit Support
+providerName = Eclipse.org
+
+_UI_CreateChild_text = {0}
+_UI_CreateChild_text2 = {1} {0}
+_UI_CreateChild_text3 = {1}
+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
+
+_UI_PropertyDescriptor_description = The {0} of the {1}
+
+_UI_DiagramElement_type = Diagram Element
+_UI_Node_type = Node
+_UI_Compartment_type = Compartment
+_UI_Connection_type = Connection
+_UI_Canvas_type = Canvas
+_UI_RunTimeProperty_type = Run Time Property
+_UI_Identity_type = Identity
+_UI_CommonBase_type = Common Base
+_UI_Unknown_type = Object
+
+_UI_Unknown_datatype= Value
+
+_UI_DiagramElement_needsTool_feature = Needs Tool
+_UI_DiagramElement_toolGroupID_feature = Tool Group ID
+_UI_DiagramElement_smallIconPath_feature = Small Icon Path
+_UI_DiagramElement_largeIconPath_feature = Large Icon Path
+_UI_Node_maxWidth_feature = Max Width
+_UI_Node_maxHeight_feature = Max Height
+_UI_Node_defaultWidth_feature = Default Width
+_UI_Node_defaultHeight_feature = Default Height
+_UI_Node_compartments_feature = Compartments
+_UI_Compartment_collapsible_feature = Collapsible
+_UI_Compartment_needsTitle_feature = Needs Title
+_UI_Connection_lineKind_feature = Line Kind
+_UI_Connection_sourceAdornment_feature = Source Adornment
+_UI_Connection_targetAdornment_feature = Target Adornment
+_UI_Canvas_nodes_feature = Nodes
+_UI_Canvas_links_feature = Links
+_UI_Identity_name_feature = Name
+_UI_CommonBase_properties_feature = Properties
+_UI_Unknown_feature = Unspecified
+
+_UI_LineKind_SOLID_literal = SOLID
+_UI_LineKind_DOT_literal = DOT
+_UI_LineKind_DASH_literal = DASH
+_UI_AdornmentKind_None_literal = None
+_UI_AdornmentKind_OpenTriangle_literal = OpenTriangle
+_UI_AdornmentKind_FilledTriangle_literal = FilledTriangle
+_UI_AdornmentKind_Rhomb_literal = Rhomb
+_UI_AdornmentKind_FilledRhomb_literal = FilledRhomb
+_UI_DiagramDefinitionEditor_menu = &DiagramDefinition Editor
+
_UI_CreateChild_menu_item = &New Child
+_UI_CreateSibling_menu_item = N&ew Sibling
+
_UI_ShowPropertiesView_menu_item = Show &Properties View
+_UI_RefreshViewer_menu_item = &Refresh
+
_UI_SelectionPage_label = Selection
+_UI_ParentPage_label = Parent
+_UI_ListPage_label = List
+_UI_TreePage_label = Tree
+_UI_TablePage_label = Table
+_UI_TreeWithColumnsPage_label = Tree with Columns
+_UI_ObjectColumn_label = Object
+_UI_SelfColumn_label = Self
+
_UI_NoObjectSelected = Selected Nothing
+_UI_SingleObjectSelected = Selected Object: {0}
+_UI_MultiObjectSelected = Selected {0} Objects
+
_UI_OpenEditorError_label = Open Editor
+
_UI_Wizard_category = Example EMF Model Creation Wizards
+
_UI_DiagramDefinitionModelWizard_label = DiagramDefinition Model
+_UI_DiagramDefinitionModelWizard_description = Create a new DiagramDefinition model
+
_UI_DiagramDefinitionEditor_label = DiagramDefinition Model Editor
+
_UI_DiagramDefinitionEditorFilenameDefaultBase = diagram1
+_UI_DiagramDefinitionEditorFilenameExtension = diadef
+
_UI_Wizard_label = New
+
_WARN_FilenameExtension = The file name must end in ".{0}"
+
_UI_ModelObject = Model Object
+_UI_XMLEncoding = XML Encoding
+_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1
+_UI_Wizard_initial_object_description = Select a model object to create
+
_UI_FileConflict_label = File Conflict
+_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
+
diff --git a/archive/org.eclipse.gmf.diadef.edit/plugin.xml b/archive/org.eclipse.gmf.diadef.edit/plugin.xml
new file mode 100644
index 000000000..6234b07f0
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/plugin.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+  <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+    <factory 
+       uri = "http://www.eclipse.org/gmf/2005/DiagramDefinition" 
+       class = "org.eclipse.gmf.diadef.provider.DiagramDefinitionItemProviderAdapterFactory"
+       supportedTypes = 
+         "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+          org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+          org.eclipse.emf.edit.provider.ITreeItemContentProvider
+          org.eclipse.emf.edit.provider.IItemLabelProvider
+          org.eclipse.emf.edit.provider.IItemPropertySource" />
+  </extension>
+  
+
+  <extension
+    point = "org.eclipse.ui.newWizards">
+    <category
+      id = "org.eclipse.emf.ecore.Wizard.category.ID"
+      name="%_UI_Wizard_category">
+    </category>
+    <wizard
+      id = "org.eclipse.gmf.diadef.presentation.DiagramDefinitionModelWizardID"
+      name = "%_UI_DiagramDefinitionModelWizard_label"
+      class = "org.eclipse.gmf.diadef.presentation.DiagramDefinitionModelWizard"
+      category = "org.eclipse.emf.ecore.Wizard.category.ID"
+      icon = "icons/full/obj16/DiagramDefinitionModelFile.gif">
+      <description>%_UI_DiagramDefinitionModelWizard_description</description>
+      <selection class = "org.eclipse.core.resources.IResource" />
+    </wizard>
+  </extension>
+
+  <extension point = "org.eclipse.ui.editors">
+    <editor
+        id = "org.eclipse.gmf.diadef.presentation.DiagramDefinitionEditorID"
+        name = "%_UI_DiagramDefinitionEditor_label"
+        icon = "icons/full/obj16/DiagramDefinitionModelFile.gif"
+        extensions = "diadef"
+        class = "org.eclipse.gmf.diadef.presentation.DiagramDefinitionEditor" 
+        contributorClass="org.eclipse.gmf.diadef.presentation.DiagramDefinitionActionBarContributor" >
+    </editor>
+  </extension>    
+</plugin>
diff --git a/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/presentation/DiagramDefinitionActionBarContributor.java b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/presentation/DiagramDefinitionActionBarContributor.java
new file mode 100644
index 000000000..e09ca7f06
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/presentation/DiagramDefinitionActionBarContributor.java
@@ -0,0 +1,403 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.gmf.diadef.provider.DiagramDefEditPlugin;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the DiagramDefinition model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class DiagramDefinitionActionBarContributor
+	extends EditingDomainActionBarContributor
+	implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+		new Action(DiagramDefEditPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet");
+				}
+				catch (PartInitException exception) {
+					DiagramDefEditPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+		new Action(DiagramDefEditPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DiagramDefinitionActionBarContributor() {
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("diagramdefinition-settings"));
+		toolBarManager.add(new Separator("diagramdefinition-additions"));
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(DiagramDefEditPlugin.INSTANCE.getString("_UI_DiagramDefinitionEditor_menu"), "org.eclipse.gmf.diadefMenuID");
+		menuManager.insertAfter("additions", submenuManager);
+		submenuManager.add(new Separator("settings"));
+		submenuManager.add(new Separator("actions"));
+		submenuManager.add(new Separator("additions"));
+		submenuManager.add(new Separator("additions-end"));
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(DiagramDefEditPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+		submenuManager.insertBefore("additions", createChildMenuManager);
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(DiagramDefEditPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+		submenuManager.insertBefore("additions", createSiblingMenuManager);
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection newChildDescriptors = null;
+		Collection newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection generateCreateChildActions(Collection descriptors, ISelection selection) {
+		Collection actions = new ArrayList();
+		if (descriptors != null) {
+			for (Iterator i = descriptors.iterator(); i.hasNext(); ) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, i.next()));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection generateCreateSiblingActions(Collection descriptors, ISelection selection) {
+		Collection actions = new ArrayList();
+		if (descriptors != null) {
+			for (Iterator i = descriptors.iterator(); i.hasNext(); ) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, i.next()));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>ID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection actions, String contributionID) {
+		if (actions != null) {
+			for (Iterator i = actions.iterator(); i.hasNext(); ) {
+				IAction action = (IAction)i.next();
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+		
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(DiagramDefEditPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("additions", submenuManager);
+
+		submenuManager = new MenuManager(DiagramDefEditPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("additions", submenuManager);
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions"));
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction);
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction);
+
+		super.addGlobalActions(menuManager);
+	}
+
+}
diff --git a/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/presentation/DiagramDefinitionEditor.java b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/presentation/DiagramDefinitionEditor.java
new file mode 100644
index 000000000..9db9ef9ec
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/presentation/DiagramDefinitionEditor.java
@@ -0,0 +1,1419 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.presentation;
+
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.ui.ViewerPane;
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EValidator;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.gmf.diadef.provider.DiagramDefEditPlugin;
+import org.eclipse.gmf.diadef.provider.DiagramDefinitionItemProviderAdapterFactory;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+
+/**
+ * This is an example of a DiagramDefinition model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class DiagramDefinitionEditor
+	extends MultiPageEditorPart
+	implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * This keeps track of the editing domain that is used to track all changes to the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AdapterFactoryEditingDomain editingDomain;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected PropertySheetPage propertySheetPage;
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer parentViewer;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Viewer currentViewer;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection selectionChangedListeners = new ArrayList();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * This listens for when the outline becomes active
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IPartListener partListener =
+		new IPartListener() {
+			public void partActivated(IWorkbenchPart p) {
+				if (p instanceof ContentOutline) {
+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
+						getActionBarContributor().setActiveEditor(DiagramDefinitionEditor.this);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (((PropertySheet)p).getCurrentPage() == propertySheetPage) {
+						getActionBarContributor().setActiveEditor(DiagramDefinitionEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == DiagramDefinitionEditor.this) {
+					handleActivate();
+				}
+			}
+			public void partBroughtToTop(IWorkbenchPart p) {
+			}
+			public void partClosed(IWorkbenchPart p) {
+			}
+			public void partDeactivated(IWorkbenchPart p) {
+			}
+			public void partOpened(IWorkbenchPart p) {
+			}
+		};
+
+	/**
+	 * Resources that have been removed since last activation.
+	 * @generated
+	 */
+	Collection removedResources = new ArrayList();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * @generated
+	 */
+	Collection changedResources = new ArrayList();
+
+	/**
+	 * Resources that have been saved.
+	 * @generated
+	 */
+	Collection savedResources = new ArrayList();
+
+	/**
+	 * This listens for workspace changes.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IResourceChangeListener resourceChangeListener =
+		new IResourceChangeListener() {
+			public void resourceChanged(IResourceChangeEvent event) {
+				// Only listening to these.
+				// if (event.getType() == IResourceDelta.POST_CHANGE)
+				{
+					IResourceDelta delta = event.getDelta();
+					try {
+						class ResourceDeltaVisitor implements IResourceDeltaVisitor {
+							protected ResourceSet resourceSet = editingDomain.getResourceSet();
+							protected Collection changedResources = new ArrayList();
+							protected Collection removedResources = new ArrayList();
+
+							public boolean visit(IResourceDelta delta) {
+								if (delta.getFlags() != IResourceDelta.MARKERS &&
+								      delta.getResource().getType() == IResource.FILE) {
+									if ((delta.getKind() & (IResourceDelta.CHANGED | IResourceDelta.REMOVED)) != 0) {
+										Resource resource = resourceSet.getResource(URI.createURI(delta.getFullPath().toString()), false);
+										if (resource != null) {
+											if ((delta.getKind() & IResourceDelta.REMOVED) != 0) {
+												removedResources.add(resource);
+											}
+											else {
+												changedResources.add(resource);
+											}
+										}
+									}
+								}
+
+								return true;
+							}
+
+							public Collection getChangedResources() {
+								return changedResources;
+							}
+
+							public Collection getRemovedResources() {
+								return removedResources;
+							}
+						}
+
+						ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
+						delta.accept(visitor);
+
+						if (!visitor.getRemovedResources().isEmpty()) {
+							removedResources.addAll(visitor.getRemovedResources());
+							if (!isDirty()) {
+								getSite().getShell().getDisplay().asyncExec
+									(new Runnable() {
+										 public void run() {
+											 getSite().getPage().closeEditor(DiagramDefinitionEditor.this, false);
+											 DiagramDefinitionEditor.this.dispose();
+										 }
+									 });
+							}
+						}
+
+						if (!visitor.getChangedResources().isEmpty()) {
+							changedResources.addAll(visitor.getChangedResources());
+						}
+					}
+					catch (CoreException exception) {
+						DiagramDefEditPlugin.INSTANCE.log(exception);
+					}
+				}
+			}
+		};
+
+	/**
+	 * Handles activation of the editor or it's associated views.
+	 * @generated
+	 */
+	protected void handleActivate() {
+		// Recompute the read only state.
+		//
+		if (editingDomain.getResourceToReadOnlyMap() != null) {
+		  editingDomain.getResourceToReadOnlyMap().clear();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(DiagramDefinitionEditor.this, false);
+				DiagramDefinitionEditor.this.dispose();
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+		  editingDomain.getCommandStack().flush();
+
+			for (Iterator i = changedResources.iterator(); i.hasNext(); ) {
+				Resource resource = (Resource)i.next();
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						DiagramDefEditPlugin.INSTANCE.log(exception);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 getString("_UI_FileConflict_label"),
+				 getString("_WARN_FileConflict"));
+	}
+
+	/**
+	 * This creates a model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DiagramDefinitionEditor() {
+		super();
+
+		// Create an adapter factory that yields item providers.
+		//
+		List factories = new ArrayList();
+		factories.add(new ResourceItemProviderAdapterFactory());
+		factories.add(new DiagramDefinitionItemProviderAdapterFactory());
+		factories.add(new ReflectiveItemProviderAdapterFactory());
+
+		adapterFactory = new ComposedAdapterFactory(factories);
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
+		//
+		commandStack.addCommandStackListener
+			(new CommandStackListener() {
+				 public void commandStackChanged(final EventObject event) {
+					 getContainer().getDisplay().asyncExec
+						 (new Runnable() {
+							  public void run() {
+								  firePropertyChange(IEditorPart.PROP_DIRTY);
+
+								  // Try to select the affected objects.
+								  //
+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
+								  if (mostRecentCommand != null) {
+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());
+								  }
+								  if (propertySheetPage != null) {
+									  propertySheetPage.refresh();
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection collection) {
+		final Collection theSelection = collection;
+		// Make sure it's okay.
+		//
+		if (theSelection != null && !theSelection.isEmpty()) {
+			// I don't know if this should be run this deferred
+			// because we might have to give the editor a chance to process the viewer update events
+			// and hence to update the views first.
+			//
+			//
+			Runnable runnable =
+				new Runnable() {
+					public void run() {
+						// Try to select the items in the current content viewer of the editor.
+						//
+						if (currentViewer != null) {
+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
+						}
+					}
+				};
+			runnable.run();
+		}
+	}
+
+	/**
+	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// Create the listener on demand.
+				//
+				selectionChangedListener =
+					new ISelectionChangedListener() {
+						// This just notifies those things that are affected by the section.
+						//
+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+							setSelection(selectionChangedEvent.getSelection());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createContextMenuFor(StructuredViewer viewer) {
+		MenuManager contextMenu = new MenuManager("#PopUp");
+		contextMenu.add(new Separator("additions"));
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, viewer);
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createModel() {
+		// I assume that the input is a file object.
+		//
+		IFileEditorInput modelFile = (IFileEditorInput)getEditorInput();
+
+		try {
+			// Load the resource through the editing domain.
+			//
+			editingDomain.loadResource(URI.createPlatformResourceURI(modelFile.getFile().getFullPath().toString()).toString());
+		}
+		catch (Exception exception) {
+			DiagramDefEditPlugin.INSTANCE.log(exception);
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Create a page for the selection tree view.
+		//
+		{
+			ViewerPane viewerPane =
+				new ViewerPane(getSite().getPage(), DiagramDefinitionEditor.this) {
+					public Viewer createViewer(Composite composite) {
+						Tree tree = new Tree(composite, SWT.MULTI);
+						TreeViewer newTreeViewer = new TreeViewer(tree);
+						return newTreeViewer;
+					}
+					public void requestActivation() {
+						super.requestActivation();
+						setCurrentViewerPane(this);
+					}
+				};
+			viewerPane.createControl(getContainer());
+
+			selectionViewer = (TreeViewer)viewerPane.getViewer();
+			selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+
+			selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+			selectionViewer.setInput(editingDomain.getResourceSet());
+			viewerPane.setTitle(editingDomain.getResourceSet());
+
+			new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+			createContextMenuFor(selectionViewer);
+			int pageIndex = addPage(viewerPane.getControl());
+			setPageText(pageIndex, getString("_UI_SelectionPage_label"));
+		}
+
+		// Create a page for the parent tree view.
+		//
+		{
+			ViewerPane viewerPane =
+				new ViewerPane(getSite().getPage(), DiagramDefinitionEditor.this) {
+					public Viewer createViewer(Composite composite) {
+						Tree tree = new Tree(composite, SWT.MULTI);
+						TreeViewer newTreeViewer = new TreeViewer(tree);
+						return newTreeViewer;
+					}
+					public void requestActivation() {
+						super.requestActivation();
+						setCurrentViewerPane(this);
+					}
+				};
+			viewerPane.createControl(getContainer());
+
+			parentViewer = (TreeViewer)viewerPane.getViewer();
+			parentViewer.setAutoExpandLevel(30);
+			parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+			parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+			createContextMenuFor(parentViewer);
+			int pageIndex = addPage(viewerPane.getControl());
+			setPageText(pageIndex, getString("_UI_ParentPage_label"));
+		}
+
+		// This is the page for the list viewer
+		//
+		{
+			ViewerPane viewerPane =
+				new ViewerPane(getSite().getPage(), DiagramDefinitionEditor.this) {
+					public Viewer createViewer(Composite composite) {
+						return new ListViewer(composite);
+					}
+					public void requestActivation() {
+						super.requestActivation();
+						setCurrentViewerPane(this);
+					}
+				};
+			viewerPane.createControl(getContainer());
+			listViewer = (ListViewer)viewerPane.getViewer();
+			listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+			listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+			createContextMenuFor(listViewer);
+			int pageIndex = addPage(viewerPane.getControl());
+			setPageText(pageIndex, getString("_UI_ListPage_label"));
+		}
+
+		// This is the page for the tree viewer
+		//
+		{
+			ViewerPane viewerPane =
+				new ViewerPane(getSite().getPage(), DiagramDefinitionEditor.this) {
+					public Viewer createViewer(Composite composite) {
+						return new TreeViewer(composite);
+					}
+					public void requestActivation() {
+						super.requestActivation();
+						setCurrentViewerPane(this);
+					}
+				};
+			viewerPane.createControl(getContainer());
+			treeViewer = (TreeViewer)viewerPane.getViewer();
+			treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+			treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+			new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+			createContextMenuFor(treeViewer);
+			int pageIndex = addPage(viewerPane.getControl());
+			setPageText(pageIndex, getString("_UI_TreePage_label"));
+		}
+
+		// This is the page for the table viewer.
+		//
+		{
+			ViewerPane viewerPane =
+				new ViewerPane(getSite().getPage(), DiagramDefinitionEditor.this) {
+					public Viewer createViewer(Composite composite) {
+						return new TableViewer(composite);
+					}
+					public void requestActivation() {
+						super.requestActivation();
+						setCurrentViewerPane(this);
+					}
+				};
+			viewerPane.createControl(getContainer());
+			tableViewer = (TableViewer)viewerPane.getViewer();
+
+			Table table = tableViewer.getTable();
+			TableLayout layout = new TableLayout();
+			table.setLayout(layout);
+			table.setHeaderVisible(true);
+			table.setLinesVisible(true);
+
+			TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+			layout.addColumnData(new ColumnWeightData(3, 100, true));
+			objectColumn.setText(getString("_UI_ObjectColumn_label"));
+			objectColumn.setResizable(true);
+
+			TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+			layout.addColumnData(new ColumnWeightData(2, 100, true));
+			selfColumn.setText(getString("_UI_SelfColumn_label"));
+			selfColumn.setResizable(true);
+
+			tableViewer.setColumnProperties(new String [] {"a", "b"});
+			tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+			tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+			createContextMenuFor(tableViewer);
+			int pageIndex = addPage(viewerPane.getControl());
+			setPageText(pageIndex, getString("_UI_TablePage_label"));
+		}
+
+		// This is the page for the table tree viewer.
+		//
+		{
+			ViewerPane viewerPane =
+				new ViewerPane(getSite().getPage(), DiagramDefinitionEditor.this) {
+					public Viewer createViewer(Composite composite) {
+						return new TreeViewer(composite);
+					}
+					public void requestActivation() {
+						super.requestActivation();
+						setCurrentViewerPane(this);
+					}
+				};
+			viewerPane.createControl(getContainer());
+
+			treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+			Tree tree = treeViewerWithColumns.getTree();
+			tree.setLayoutData(new FillLayout());
+			tree.setHeaderVisible(true);
+			tree.setLinesVisible(true);
+
+			TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+			objectColumn.setText(getString("_UI_ObjectColumn_label"));
+			objectColumn.setResizable(true);
+			objectColumn.setWidth(250);
+
+			TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+			selfColumn.setText(getString("_UI_SelfColumn_label"));
+			selfColumn.setResizable(true);
+			selfColumn.setWidth(200);
+
+			treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"});
+			treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+			treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+			createContextMenuFor(treeViewerWithColumns);
+			int pageIndex = addPage(viewerPane.getControl());
+			setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));
+		}
+
+		setActivePage(0);
+
+		getContainer().addControlListener
+			(new ControlAdapter() {
+				boolean guard = false;
+				public void controlResized(ControlEvent event) {
+					if (!guard) {
+						guard = true;
+						hideTabs();
+						guard = false;
+					}
+				}
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part, this hides
+	 * the single tab at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void hideTabs() {
+		if (getPageCount() <= 1) {
+			setPageText(0, "");
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(1);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		// This is a temporary workaround... EATM
+		//
+		Control control = getControl(pageIndex);
+		if (control != null) {
+			control.setVisible(true);
+			control.setFocus();
+		}
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return getContentOutlinePage();
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  ArrayList selection = new ArrayList();
+					  selection.add(editingDomain.getResourceSet().getResources().get(0));
+					  contentOutlineViewer.setSelection(new StructuredSelection(selection), true);
+					}
+				}
+
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// Listen to selection so that we can handle it is a special way.
+			//
+			contentOutlinePage.addSelectionChangedListener
+				(new ISelectionChangedListener() {
+					 // This ensures that we handle selections correctly.
+					 //
+					 public void selectionChanged(SelectionChangedEvent event) {
+						 handleContentOutlineSelection(event.getSelection());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * This accesses a cached version of the property sheet.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IPropertySheetPage getPropertySheetPage() {
+		if (propertySheetPage == null) {
+			propertySheetPage =
+				new PropertySheetPage() {
+					public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+						super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					}
+
+					public void setActionBars(IActionBars actionBars) {
+						super.setActionBars(actionBars);
+						getActionBarContributor().shareGlobalActions(this, actionBars);
+					}
+				};
+			propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		}
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * This deals with how we want selection in the outliner to affect the other views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void handleContentOutlineSelection(ISelection selection) {
+		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
+			Iterator selectedElements = ((IStructuredSelection)selection).iterator();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList selectionList = new ArrayList();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isDirty() {
+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation =
+			new WorkspaceModifyOperation() {
+				// This is the method that gets invoked when the operation runs.
+				//
+				public void execute(IProgressMonitor monitor) {
+					try {
+						// Save the resource to the file system.
+						//
+						Resource savedResource = (Resource)editingDomain.getResourceSet().getResources().get(0);
+						savedResources.add(savedResource);
+						savedResource.save(Collections.EMPTY_MAP);
+					}
+					catch (Exception exception) {
+						DiagramDefEditPlugin.INSTANCE.log(exception);
+					}
+				}
+			};
+
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			DiagramDefEditPlugin.INSTANCE.log(exception);
+		}
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog= new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path= saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString()), new FileEditorInput(file));
+			}
+		}
+	}
+	
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		((Resource)editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInput(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void gotoMarker(IMarker marker) {
+		try {
+			if (marker.getType().equals(EValidator.MARKER)) {
+				String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);
+				if (uriAttribute != null) {
+					URI uri = URI.createURI(uriAttribute);
+					EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);
+					if (eObject != null) {
+					  setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));
+					}
+				}
+			}
+		}
+		catch (CoreException exception) {
+			DiagramDefEditPlugin.INSTANCE.log(exception);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInput(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFocus() {
+		getControl(getActivePage()).setFocus();
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (Iterator listeners = selectionChangedListeners.iterator(); listeners.hasNext(); ) {
+			ISelectionChangedListener listener = (ISelectionChangedListener)listeners.next();
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+	
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				Collection collection = ((IStructuredSelection)selection).toList();
+				switch (collection.size()) {
+					case 0: {
+						statusLineManager.setMessage(getString("_UI_NoObjectSelected"));
+						break;
+					}
+					case 1: {
+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));
+						break;
+					}
+					default: {
+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));
+						break;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage("");
+			}
+		}
+	}
+
+	/**
+	 * This looks up a string in the plugin's plugin.properties file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key) {
+		return DiagramDefEditPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * This looks up a string in plugin.properties, making a substitution.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key, Object s1) {
+		return DiagramDefEditPlugin.INSTANCE.getString(key, new Object [] { s1 });
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void menuAboutToShow(IMenuManager menuManager) {
+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void dispose() {
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		if (propertySheetPage != null) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+}
diff --git a/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/presentation/DiagramDefinitionModelWizard.java b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/presentation/DiagramDefinitionModelWizard.java
new file mode 100644
index 000000000..0f612ff49
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/presentation/DiagramDefinitionModelWizard.java
@@ -0,0 +1,591 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.gmf.diadef.DiagramDefinitionFactory;
+import org.eclipse.gmf.diadef.DiagramDefinitionPackage;
+import org.eclipse.gmf.diadef.provider.DiagramDefEditPlugin;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+
+/**
+ * This is a simple wizard for creating a new model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class DiagramDefinitionModelWizard extends Wizard implements INewWizard {
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DiagramDefinitionPackage diagramDefinitionPackage = DiagramDefinitionPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DiagramDefinitionFactory diagramDefinitionFactory = diagramDefinitionPackage.getDiagramDefinitionFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DiagramDefinitionModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DiagramDefinitionModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * Caches the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List initialObjectNames;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(DiagramDefEditPlugin.INSTANCE.getString("_UI_Wizard_label"));
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(DiagramDefEditPlugin.INSTANCE.getImage("full/wizban/NewDiagramDefinition")));
+	}
+
+	/**
+	 * Returns the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection getInitialObjectNames() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList();
+			for (Iterator classifiers = diagramDefinitionPackage.getEClassifiers().iterator(); classifiers.hasNext(); ) {
+				EClassifier eClassifier = (EClassifier)classifiers.next();
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, java.text.Collator.getInstance());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)diagramDefinitionPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = diagramDefinitionFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// Do the work within an operation.
+			//
+			WorkspaceModifyOperation operation =
+				new WorkspaceModifyOperation() {
+					protected void execute(IProgressMonitor progressMonitor) {
+						try {
+							// Create a resource set
+							//
+							ResourceSet resourceSet = new ResourceSetImpl();
+
+							// Get the URI of the model file.
+							//
+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString());
+
+							// Create a resource for this file.
+							//
+							Resource resource = resourceSet.createResource(fileURI);
+
+							// Add the initial model object to the contents.
+							//
+							EObject rootObject = createInitialModel();
+							if (rootObject != null) {
+								resource.getContents().add(rootObject);
+							}
+
+							// Save the contents of the resource to the file system.
+							//
+							Map options = new HashMap();
+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+							resource.save(options);
+						}
+						catch (Exception exception) {
+							DiagramDefEditPlugin.INSTANCE.log(exception);
+						}
+						finally {
+							progressMonitor.done();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(new Runnable() {
+						 public void run() {
+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+						 }
+					 });
+			}
+
+			// Open an editor on the new file.
+			//
+			try {
+				page.openEditor
+					(new FileEditorInput(modelFile),
+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
+			}
+			catch (PartInitException exception) {
+				MessageDialog.openError(workbenchWindow.getShell(), DiagramDefEditPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			DiagramDefEditPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class DiagramDefinitionModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public DiagramDefinitionModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				// Make sure the file ends in ".diagramdefinition".
+				//
+				String requiredExt = DiagramDefEditPlugin.INSTANCE.getString("_UI_DiagramDefinitionEditorFilenameExtension");
+				String enteredExt = new Path(getFileName()).getFileExtension();
+				if (enteredExt == null || !enteredExt.equals(requiredExt)) {
+					setErrorMessage(DiagramDefEditPlugin.INSTANCE.getString("_WARN_FilenameExtension", new Object [] { requiredExt }));
+					return false;
+				}
+				else {
+					return true;
+				}
+			}
+			else {
+				return false;
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * This is the page where the type of object to create is selected.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class DiagramDefinitionModelWizardInitialObjectCreationPage extends WizardPage {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo initialObjectField;
+
+		/**
+		 * @generated
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 */
+		protected List encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public DiagramDefinitionModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE);
+			{
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(DiagramDefEditPlugin.INSTANCE.getString("_UI_ModelObject"));
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (Iterator i = getInitialObjectNames().iterator(); i.hasNext(); ) {
+				initialObjectField.add(getLabel((String)i.next()));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(DiagramDefEditPlugin.INSTANCE.getString("_UI_XMLEncoding"));
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (Iterator i = getEncodings().iterator(); i.hasNext(); ) {
+				encodingField.add((String)i.next());
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+			new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (Iterator i = getInitialObjectNames().iterator(); i.hasNext(); ) {
+				String name = (String)i.next();
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * Returns the label for the specified type name.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected String getLabel(String typeName) {
+			try {
+				return DiagramDefEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");
+			}
+			catch(MissingResourceException mre) {
+				DiagramDefEditPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Collection getEncodings() {
+			if (encodings == null) {
+				encodings = new ArrayList();
+				for (StringTokenizer stringTokenizer = new StringTokenizer(DiagramDefEditPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new DiagramDefinitionModelWizardNewFileCreationPage("Whatever", selection);
+		newFileCreationPage.setTitle(DiagramDefEditPlugin.INSTANCE.getString("_UI_DiagramDefinitionModelWizard_label"));
+		newFileCreationPage.setDescription(DiagramDefEditPlugin.INSTANCE.getString("_UI_DiagramDefinitionModelWizard_description"));
+		newFileCreationPage.setFileName(DiagramDefEditPlugin.INSTANCE.getString("_UI_DiagramDefinitionEditorFilenameDefaultBase") + "." + DiagramDefEditPlugin.INSTANCE.getString("_UI_DiagramDefinitionEditorFilenameExtension"));
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					String defaultModelBaseFilename = DiagramDefEditPlugin.INSTANCE.getString("_UI_DiagramDefinitionEditorFilenameDefaultBase");
+					String defaultModelFilenameExtension = DiagramDefEditPlugin.INSTANCE.getString("_UI_DiagramDefinitionEditorFilenameExtension");
+					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new DiagramDefinitionModelWizardInitialObjectCreationPage("Whatever2");
+		initialObjectCreationPage.setTitle(DiagramDefEditPlugin.INSTANCE.getString("_UI_DiagramDefinitionModelWizard_label"));
+		initialObjectCreationPage.setDescription(DiagramDefEditPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.getModelFile();
+	}
+
+}
diff --git a/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/CanvasItemProvider.java b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/CanvasItemProvider.java
new file mode 100644
index 000000000..ec9ae62c3
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/CanvasItemProvider.java
@@ -0,0 +1,167 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.gmf.diadef.Canvas;
+import org.eclipse.gmf.diadef.DiagramDefinitionFactory;
+import org.eclipse.gmf.diadef.DiagramDefinitionPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.gmf.diadef.Canvas} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class CanvasItemProvider
+	extends CommonBaseItemProvider
+	implements	
+		IEditingDomainItemProvider,	
+		IStructuredItemContentProvider,	
+		ITreeItemContentProvider,	
+		IItemLabelProvider,	
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CanvasItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public List getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Collection getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(DiagramDefinitionPackage.eINSTANCE.getCanvas_Nodes());
+			childrenFeatures.add(DiagramDefinitionPackage.eINSTANCE.getCanvas_Links());
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns Canvas.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object getImage(Object object) {
+		return getResourceLocator().getImage("full/obj16/Canvas");
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getText(Object object) {
+		String label = ((Canvas)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_Canvas_type") :
+			getString("_UI_Canvas_type") + " " + label;
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(Canvas.class)) {
+			case DiagramDefinitionPackage.CANVAS__NODES:
+			case DiagramDefinitionPackage.CANVAS__LINKS:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
+	 * describing all of the children that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(DiagramDefinitionPackage.eINSTANCE.getCanvas_Nodes(),
+				 DiagramDefinitionFactory.eINSTANCE.createNode()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(DiagramDefinitionPackage.eINSTANCE.getCanvas_Links(),
+				 DiagramDefinitionFactory.eINSTANCE.createConnection()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ResourceLocator getResourceLocator() {
+		return DiagramDefEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/CommonBaseItemProvider.java b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/CommonBaseItemProvider.java
new file mode 100644
index 000000000..8bc34d461
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/CommonBaseItemProvider.java
@@ -0,0 +1,137 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.gmf.diadef.CommonBase;
+import org.eclipse.gmf.diadef.DiagramDefinitionFactory;
+import org.eclipse.gmf.diadef.DiagramDefinitionPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.gmf.diadef.CommonBase} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class CommonBaseItemProvider
+	extends IdentityItemProvider
+	implements	
+		IEditingDomainItemProvider,	
+		IStructuredItemContentProvider,	
+		ITreeItemContentProvider,	
+		IItemLabelProvider,	
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CommonBaseItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public List getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Collection getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(DiagramDefinitionPackage.eINSTANCE.getCommonBase_Properties());
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getText(Object object) {
+		String label = ((CommonBase)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_CommonBase_type") :
+			getString("_UI_CommonBase_type") + " " + label;
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(CommonBase.class)) {
+			case DiagramDefinitionPackage.COMMON_BASE__PROPERTIES:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
+	 * describing all of the children that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(DiagramDefinitionPackage.eINSTANCE.getCommonBase_Properties(),
+				 DiagramDefinitionFactory.eINSTANCE.createRunTimeProperty()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ResourceLocator getResourceLocator() {
+		return DiagramDefEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/CompartmentItemProvider.java b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/CompartmentItemProvider.java
new file mode 100644
index 000000000..b28230c54
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/CompartmentItemProvider.java
@@ -0,0 +1,170 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.gmf.diadef.Compartment;
+import org.eclipse.gmf.diadef.DiagramDefinitionPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.gmf.diadef.Compartment} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class CompartmentItemProvider
+	extends IdentityItemProvider
+	implements	
+		IEditingDomainItemProvider,	
+		IStructuredItemContentProvider,	
+		ITreeItemContentProvider,	
+		IItemLabelProvider,	
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CompartmentItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public List getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addCollapsiblePropertyDescriptor(object);
+			addNeedsTitlePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Collapsible feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addCollapsiblePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_Compartment_collapsible_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Compartment_collapsible_feature", "_UI_Compartment_type"),
+				 DiagramDefinitionPackage.eINSTANCE.getCompartment_Collapsible(),
+				 true,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Needs Title feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addNeedsTitlePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_Compartment_needsTitle_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Compartment_needsTitle_feature", "_UI_Compartment_type"),
+				 DiagramDefinitionPackage.eINSTANCE.getCompartment_NeedsTitle(),
+				 true,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns Compartment.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object getImage(Object object) {
+		return getResourceLocator().getImage("full/obj16/Compartment");
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getText(Object object) {
+		String label = ((Compartment)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_Compartment_type") :
+			getString("_UI_Compartment_type") + " " + label;
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(Compartment.class)) {
+			case DiagramDefinitionPackage.COMPARTMENT__COLLAPSIBLE:
+			case DiagramDefinitionPackage.COMPARTMENT__NEEDS_TITLE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
+	 * describing all of the children that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ResourceLocator getResourceLocator() {
+		return DiagramDefEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/ConnectionItemProvider.java b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/ConnectionItemProvider.java
new file mode 100644
index 000000000..20f5b0a93
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/ConnectionItemProvider.java
@@ -0,0 +1,192 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.gmf.diadef.Connection;
+import org.eclipse.gmf.diadef.DiagramDefinitionPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.gmf.diadef.Connection} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ConnectionItemProvider
+	extends DiagramElementItemProvider
+	implements	
+		IEditingDomainItemProvider,	
+		IStructuredItemContentProvider,	
+		ITreeItemContentProvider,	
+		IItemLabelProvider,	
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ConnectionItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public List getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addLineKindPropertyDescriptor(object);
+			addSourceAdornmentPropertyDescriptor(object);
+			addTargetAdornmentPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Line Kind feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLineKindPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_Connection_lineKind_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Connection_lineKind_feature", "_UI_Connection_type"),
+				 DiagramDefinitionPackage.eINSTANCE.getConnection_LineKind(),
+				 true,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Source Adornment feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addSourceAdornmentPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_Connection_sourceAdornment_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Connection_sourceAdornment_feature", "_UI_Connection_type"),
+				 DiagramDefinitionPackage.eINSTANCE.getConnection_SourceAdornment(),
+				 true,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Target Adornment feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addTargetAdornmentPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_Connection_targetAdornment_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Connection_targetAdornment_feature", "_UI_Connection_type"),
+				 DiagramDefinitionPackage.eINSTANCE.getConnection_TargetAdornment(),
+				 true,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns Connection.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object getImage(Object object) {
+		return getResourceLocator().getImage("full/obj16/Connection");
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getText(Object object) {
+		String label = ((Connection)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_Connection_type") :
+			getString("_UI_Connection_type") + " " + label;
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(Connection.class)) {
+			case DiagramDefinitionPackage.CONNECTION__LINE_KIND:
+			case DiagramDefinitionPackage.CONNECTION__SOURCE_ADORNMENT:
+			case DiagramDefinitionPackage.CONNECTION__TARGET_ADORNMENT:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
+	 * describing all of the children that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ResourceLocator getResourceLocator() {
+		return DiagramDefEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/DiagramDefEditPlugin.java b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/DiagramDefEditPlugin.java
new file mode 100644
index 000000000..af2783387
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/DiagramDefEditPlugin.java
@@ -0,0 +1,91 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.provider;
+
+import org.eclipse.emf.common.EMFPlugin;
+import org.eclipse.emf.common.util.ResourceLocator;
+
+/**
+ * This is the central singleton for the DiaDef editor plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public final class DiagramDefEditPlugin extends EMFPlugin {
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final DiagramDefEditPlugin INSTANCE = new DiagramDefEditPlugin();
+
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static Implementation plugin;
+
+	/**
+	 * Create the instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DiagramDefEditPlugin() {
+		super
+		  (new ResourceLocator [] {
+		   });
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	public ResourceLocator getPluginResourceLocator() {
+		return plugin;
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	public static Implementation getPlugin() {
+		return plugin;
+	}
+
+	/**
+	 * The actual implementation of the Eclipse <b>Plugin</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static class Implementation extends EclipsePlugin {
+		/**
+		 * Creates an instance.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public Implementation() {
+			super();
+
+			// Remember the static instance.
+			//
+			plugin = this;
+		}
+	}
+
+}
diff --git a/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/DiagramDefinitionItemProviderAdapterFactory.java b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/DiagramDefinitionItemProviderAdapterFactory.java
new file mode 100644
index 000000000..f0429470e
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/DiagramDefinitionItemProviderAdapterFactory.java
@@ -0,0 +1,289 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.gmf.diadef.util.DiagramDefinitionAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class DiagramDefinitionItemProviderAdapterFactory extends DiagramDefinitionAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection supportedTypes = new ArrayList();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DiagramDefinitionItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);		
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.diadef.Node} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NodeItemProvider nodeItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.gmf.diadef.Node}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createNodeAdapter() {
+		if (nodeItemProvider == null) {
+			nodeItemProvider = new NodeItemProvider(this);
+		}
+
+		return nodeItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.diadef.Compartment} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CompartmentItemProvider compartmentItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.gmf.diadef.Compartment}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createCompartmentAdapter() {
+		if (compartmentItemProvider == null) {
+			compartmentItemProvider = new CompartmentItemProvider(this);
+		}
+
+		return compartmentItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.diadef.Connection} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ConnectionItemProvider connectionItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.gmf.diadef.Connection}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createConnectionAdapter() {
+		if (connectionItemProvider == null) {
+			connectionItemProvider = new ConnectionItemProvider(this);
+		}
+
+		return connectionItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.diadef.Canvas} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CanvasItemProvider canvasItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.gmf.diadef.Canvas}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createCanvasAdapter() {
+		if (canvasItemProvider == null) {
+			canvasItemProvider = new CanvasItemProvider(this);
+		}
+
+		return canvasItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.diadef.RunTimeProperty} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected RunTimePropertyItemProvider runTimePropertyItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.gmf.diadef.RunTimeProperty}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createRunTimePropertyAdapter() {
+		if (runTimePropertyItemProvider == null) {
+			runTimePropertyItemProvider = new RunTimePropertyItemProvider(this);
+		}
+
+		return runTimePropertyItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class) || (((Class)type).isInstance(adapter))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * This disposes all of the item providers created by this factory. 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void dispose() {
+		if (nodeItemProvider != null) nodeItemProvider.dispose();
+		if (compartmentItemProvider != null) compartmentItemProvider.dispose();
+		if (connectionItemProvider != null) connectionItemProvider.dispose();
+		if (canvasItemProvider != null) canvasItemProvider.dispose();
+		if (runTimePropertyItemProvider != null) runTimePropertyItemProvider.dispose();
+	}
+
+}
diff --git a/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/DiagramElementItemProvider.java b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/DiagramElementItemProvider.java
new file mode 100644
index 000000000..a992e41d6
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/DiagramElementItemProvider.java
@@ -0,0 +1,204 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.gmf.diadef.DiagramDefinitionPackage;
+import org.eclipse.gmf.diadef.DiagramElement;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.gmf.diadef.DiagramElement} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class DiagramElementItemProvider
+	extends CommonBaseItemProvider
+	implements	
+		IEditingDomainItemProvider,	
+		IStructuredItemContentProvider,	
+		ITreeItemContentProvider,	
+		IItemLabelProvider,	
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DiagramElementItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public List getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addNeedsToolPropertyDescriptor(object);
+			addToolGroupIDPropertyDescriptor(object);
+			addSmallIconPathPropertyDescriptor(object);
+			addLargeIconPathPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Needs Tool feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addNeedsToolPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_DiagramElement_needsTool_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_DiagramElement_needsTool_feature", "_UI_DiagramElement_type"),
+				 DiagramDefinitionPackage.eINSTANCE.getDiagramElement_NeedsTool(),
+				 true,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Tool Group ID feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addToolGroupIDPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_DiagramElement_toolGroupID_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_DiagramElement_toolGroupID_feature", "_UI_DiagramElement_type"),
+				 DiagramDefinitionPackage.eINSTANCE.getDiagramElement_ToolGroupID(),
+				 true,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Small Icon Path feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addSmallIconPathPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_DiagramElement_smallIconPath_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_DiagramElement_smallIconPath_feature", "_UI_DiagramElement_type"),
+				 DiagramDefinitionPackage.eINSTANCE.getDiagramElement_SmallIconPath(),
+				 true,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Large Icon Path feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLargeIconPathPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_DiagramElement_largeIconPath_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_DiagramElement_largeIconPath_feature", "_UI_DiagramElement_type"),
+				 DiagramDefinitionPackage.eINSTANCE.getDiagramElement_LargeIconPath(),
+				 true,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getText(Object object) {
+		String label = ((DiagramElement)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_DiagramElement_type") :
+			getString("_UI_DiagramElement_type") + " " + label;
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(DiagramElement.class)) {
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__NEEDS_TOOL:
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__TOOL_GROUP_ID:
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__SMALL_ICON_PATH:
+			case DiagramDefinitionPackage.DIAGRAM_ELEMENT__LARGE_ICON_PATH:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
+	 * describing all of the children that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ResourceLocator getResourceLocator() {
+		return DiagramDefEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/IdentityItemProvider.java b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/IdentityItemProvider.java
new file mode 100644
index 000000000..93346df36
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/IdentityItemProvider.java
@@ -0,0 +1,139 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.gmf.diadef.DiagramDefinitionPackage;
+import org.eclipse.gmf.diadef.Identity;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.gmf.diadef.Identity} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class IdentityItemProvider
+	extends ItemProviderAdapter
+	implements	
+		IEditingDomainItemProvider,	
+		IStructuredItemContentProvider,	
+		ITreeItemContentProvider,	
+		IItemLabelProvider,	
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IdentityItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public List getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addNamePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Name feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_Identity_name_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Identity_name_feature", "_UI_Identity_type"),
+				 DiagramDefinitionPackage.eINSTANCE.getIdentity_Name(),
+				 true,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getText(Object object) {
+		String label = ((Identity)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_Identity_type") :
+			getString("_UI_Identity_type") + " " + label;
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(Identity.class)) {
+			case DiagramDefinitionPackage.IDENTITY__NAME:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
+	 * describing all of the children that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ResourceLocator getResourceLocator() {
+		return DiagramDefEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/NodeItemProvider.java b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/NodeItemProvider.java
new file mode 100644
index 000000000..395bf14d2
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/NodeItemProvider.java
@@ -0,0 +1,239 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.gmf.diadef.DiagramDefinitionFactory;
+import org.eclipse.gmf.diadef.DiagramDefinitionPackage;
+import org.eclipse.gmf.diadef.Node;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.gmf.diadef.Node} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NodeItemProvider
+	extends DiagramElementItemProvider
+	implements	
+		IEditingDomainItemProvider,	
+		IStructuredItemContentProvider,	
+		ITreeItemContentProvider,	
+		IItemLabelProvider,	
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NodeItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public List getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addMaxWidthPropertyDescriptor(object);
+			addMaxHeightPropertyDescriptor(object);
+			addDefaultWidthPropertyDescriptor(object);
+			addDefaultHeightPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Max Width feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addMaxWidthPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_Node_maxWidth_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Node_maxWidth_feature", "_UI_Node_type"),
+				 DiagramDefinitionPackage.eINSTANCE.getNode_MaxWidth(),
+				 true,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Max Height feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addMaxHeightPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_Node_maxHeight_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Node_maxHeight_feature", "_UI_Node_type"),
+				 DiagramDefinitionPackage.eINSTANCE.getNode_MaxHeight(),
+				 true,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Default Width feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDefaultWidthPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_Node_defaultWidth_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Node_defaultWidth_feature", "_UI_Node_type"),
+				 DiagramDefinitionPackage.eINSTANCE.getNode_DefaultWidth(),
+				 true,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Default Height feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDefaultHeightPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_Node_defaultHeight_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Node_defaultHeight_feature", "_UI_Node_type"),
+				 DiagramDefinitionPackage.eINSTANCE.getNode_DefaultHeight(),
+				 true,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Collection getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(DiagramDefinitionPackage.eINSTANCE.getNode_Compartments());
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * This returns Node.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object getImage(Object object) {
+		return getResourceLocator().getImage("full/obj16/Node");
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getText(Object object) {
+		String label = ((Node)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_Node_type") :
+			getString("_UI_Node_type") + " " + label;
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(Node.class)) {
+			case DiagramDefinitionPackage.NODE__MAX_WIDTH:
+			case DiagramDefinitionPackage.NODE__MAX_HEIGHT:
+			case DiagramDefinitionPackage.NODE__DEFAULT_WIDTH:
+			case DiagramDefinitionPackage.NODE__DEFAULT_HEIGHT:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+			case DiagramDefinitionPackage.NODE__COMPARTMENTS:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
+	 * describing all of the children that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(DiagramDefinitionPackage.eINSTANCE.getNode_Compartments(),
+				 DiagramDefinitionFactory.eINSTANCE.createCompartment()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ResourceLocator getResourceLocator() {
+		return DiagramDefEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/RunTimePropertyItemProvider.java b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/RunTimePropertyItemProvider.java
new file mode 100644
index 000000000..466b2ac1c
--- /dev/null
+++ b/archive/org.eclipse.gmf.diadef.edit/src/org/eclipse/gmf/diadef/provider/RunTimePropertyItemProvider.java
@@ -0,0 +1,117 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.diadef.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.gmf.diadef.RunTimeProperty;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.gmf.diadef.RunTimeProperty} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class RunTimePropertyItemProvider
+	extends IdentityItemProvider
+	implements	
+		IEditingDomainItemProvider,	
+		IStructuredItemContentProvider,	
+		ITreeItemContentProvider,	
+		IItemLabelProvider,	
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RunTimePropertyItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public List getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This returns RunTimeProperty.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object getImage(Object object) {
+		return getResourceLocator().getImage("full/obj16/RunTimeProperty");
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getText(Object object) {
+		String label = ((RunTimeProperty)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_RunTimeProperty_type") :
+			getString("_UI_RunTimeProperty_type") + " " + label;
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
+	 * describing all of the children that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ResourceLocator getResourceLocator() {
+		return DiagramDefEditPlugin.INSTANCE;
+	}
+
+}
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
diff --git a/archive/org.eclipse.gmf.edit/.classpath b/archive/org.eclipse.gmf.edit/.classpath
new file mode 100644
index 000000000..065ac06e1
--- /dev/null
+++ b/archive/org.eclipse.gmf.edit/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/archive/org.eclipse.gmf.edit/.cvsignore b/archive/org.eclipse.gmf.edit/.cvsignore
new file mode 100644
index 000000000..ba077a403
--- /dev/null
+++ b/archive/org.eclipse.gmf.edit/.cvsignore
@@ -0,0 +1 @@
+bin
diff --git a/archive/org.eclipse.gmf.edit/.project b/archive/org.eclipse.gmf.edit/.project
new file mode 100644
index 000000000..aedd9584d
--- /dev/null
+++ b/archive/org.eclipse.gmf.edit/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.gmf.edit</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.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/archive/org.eclipse.gmf.edit/META-INF/MANIFEST.MF b/archive/org.eclipse.gmf.edit/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..3334b0d9c
--- /dev/null
+++ b/archive/org.eclipse.gmf.edit/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: GMF.Edit Plug-in
+Bundle-SymbolicName: org.eclipse.gmf.edit
+Bundle-Version: 1.0.0
+Bundle-Vendor: Eclipse.org
+Require-Bundle: org.eclipse.emf.edit,
+ org.eclipse.gmf.runtime
+Export-Package: org.eclipse.gmf.edit.provider.metainfo
diff --git a/archive/org.eclipse.gmf.edit/build.properties b/archive/org.eclipse.gmf.edit/build.properties
new file mode 100644
index 000000000..30d8c0866
--- /dev/null
+++ b/archive/org.eclipse.gmf.edit/build.properties
@@ -0,0 +1,5 @@
+bin.includes = META-INF/,\
+               .
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/AdapterFactoryMetaInfoSource.java b/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/AdapterFactoryMetaInfoSource.java
new file mode 100644
index 000000000..0e0cc6a15
--- /dev/null
+++ b/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/AdapterFactoryMetaInfoSource.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2005 Borland Software Corporation
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Artem Tikhomirov (Borland) - initial API and implementation
+ */
+package org.eclipse.gmf.edit.provider.metainfo;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.gmf.diagramrt.DiagramCanvas;
+import org.eclipse.gmf.diagramrt.DiagramLink;
+import org.eclipse.gmf.diagramrt.DiagramNode;
+
+/**
+ * Implementation of {@link org.eclipse.gmf.edit.provider.metainfo.MetaInfoSource} 
+ * that uses EMF Adapters mechanism.
+ * @author artem
+ */
+public class AdapterFactoryMetaInfoSource extends AdapterImpl implements MetaInfoSource {
+	private final AdapterFactory myMetaInfoFactory;
+
+	public AdapterFactoryMetaInfoSource(AdapterFactory metaInfoFactory) {
+		assert metaInfoFactory != null;
+		assert metaInfoFactory.isFactoryForType(NodeMetaInfoProvider.class) && metaInfoFactory.isFactoryForType(LinkMetaInfoProvider.class);
+		myMetaInfoFactory = metaInfoFactory;
+	}
+
+	public boolean isAdapterForType(Object type) {
+		return MetaInfoSource.class == type;
+	}
+
+	public NodeMetaInfoProvider getNodeInfo(DiagramNode diagramNode) {
+		return (NodeMetaInfoProvider) myMetaInfoFactory.adapt(diagramNode, NodeMetaInfoProvider.class);
+	}
+
+	public LinkMetaInfoProvider getLinkInfo(DiagramLink diagramLink) {
+		return (LinkMetaInfoProvider) myMetaInfoFactory.adapt(diagramLink, LinkMetaInfoProvider.class);
+	}
+
+	public CanvasMetaInfoProvider getCanvasInfo(DiagramCanvas diagramCanvas) {
+		return (CanvasMetaInfoProvider) myMetaInfoFactory.adapt(diagramCanvas, CanvasMetaInfoProvider.class);
+	}
+	
+	/**
+	 * inspired by {@link org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain#getEditingDomainFor(org.eclipse.emf.ecore.EObject)}
+	 */
+	public static MetaInfoSource getMetaInfoSource(DiagramCanvas canvas) {
+		return (MetaInfoSource) EcoreUtil.getExistingAdapter(canvas, MetaInfoSource.class);
+	}
+}
diff --git a/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/CanvasMetaInfoProvider.java b/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/CanvasMetaInfoProvider.java
new file mode 100644
index 000000000..78adb8790
--- /dev/null
+++ b/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/CanvasMetaInfoProvider.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2005 Borland Software Corporation
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Artem Tikhomirov (Borland) - initial API and implementation
+ */
+package org.eclipse.gmf.edit.provider.metainfo;
+
+/**
+ * Placeholder for meta features of diagram surface.
+ * @author artem
+ */
+public interface CanvasMetaInfoProvider {
+
+}
diff --git a/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/ChildMetaInfoProvider.java b/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/ChildMetaInfoProvider.java
new file mode 100644
index 000000000..f234a4dd4
--- /dev/null
+++ b/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/ChildMetaInfoProvider.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2005 Borland Software Corporation
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Artem Tikhomirov (Borland) - initial API and implementation
+ */
+package org.eclipse.gmf.edit.provider.metainfo;
+
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.gmf.diagramrt.ChildNode;
+import org.eclipse.gmf.diagramrt.DiagramNode;
+
+/**
+ * Meta features of domain elements represented as child nodes.
+ * Still placeholder
+ * @author artem
+ */
+public interface ChildMetaInfoProvider {
+
+	EReference getContainmentFeature(DiagramNode parentNode, ChildNode childNode);
+	EReference getListingFeature(DiagramNode parentNode, ChildNode childNode);
+	String getCompartmentID(DiagramNode parentNode, ChildNode childNode);
+}
diff --git a/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/LinkMetaInfoProvider.java b/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/LinkMetaInfoProvider.java
new file mode 100644
index 000000000..5403db161
--- /dev/null
+++ b/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/LinkMetaInfoProvider.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2005 Borland Software Corporation
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Artem Tikhomirov (Borland) - initial API and implementation
+ */
+package org.eclipse.gmf.edit.provider.metainfo;
+
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.diagramrt.DiagramLink;
+
+/**
+ * Meta features of domain elements represented as diagram links
+ * @author artem
+ */
+public interface LinkMetaInfoProvider {
+
+	EStructuralFeature getTargetFeature(DiagramLink diagramLink);
+	EReference getContainmentFeature(DiagramLink diagramLink);
+}
diff --git a/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/MetaInfoProviderAdapter.java b/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/MetaInfoProviderAdapter.java
new file mode 100644
index 000000000..7201a49a8
--- /dev/null
+++ b/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/MetaInfoProviderAdapter.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2005 Borland Software Corporation
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Artem Tikhomirov (Borland) - initial API and implementation
+ */
+package org.eclipse.gmf.edit.provider.metainfo;
+
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.edit.provider.IDisposable;
+
+/**
+ * Basic provider implementation that uses EMF Adapter mechanism to 
+ * keep track of provider instances
+ * @author artem
+ */
+public class MetaInfoProviderAdapter extends AdapterImpl implements IDisposable {
+
+	public void dispose() {
+		// TODO Auto-generated method stub
+	}
+}
diff --git a/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/MetaInfoSource.java b/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/MetaInfoSource.java
new file mode 100644
index 000000000..2328f1f91
--- /dev/null
+++ b/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/MetaInfoSource.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2005 Borland Software Corporation
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Artem Tikhomirov (Borland) - initial API and implementation
+ */
+package org.eclipse.gmf.edit.provider.metainfo;
+
+import org.eclipse.gmf.diagramrt.DiagramCanvas;
+import org.eclipse.gmf.diagramrt.DiagramLink;
+import org.eclipse.gmf.diagramrt.DiagramNode;
+
+/**
+ * Access to domain metainfo from diagram elements
+ * @author artem
+ */
+public interface MetaInfoSource {
+
+	NodeMetaInfoProvider getNodeInfo(DiagramNode diagramNode);
+	LinkMetaInfoProvider getLinkInfo(DiagramLink diagramLink);
+	CanvasMetaInfoProvider getCanvasInfo(DiagramCanvas diagramCanvas);
+}
diff --git a/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/NodeMetaInfoProvider.java b/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/NodeMetaInfoProvider.java
new file mode 100644
index 000000000..bdf372943
--- /dev/null
+++ b/archive/org.eclipse.gmf.edit/src/org/eclipse/gmf/edit/provider/metainfo/NodeMetaInfoProvider.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2005 Borland Software Corporation
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Artem Tikhomirov (Borland) - initial API and implementation
+ */
+package org.eclipse.gmf.edit.provider.metainfo;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.gmf.diagramrt.ChildNode;
+import org.eclipse.gmf.diagramrt.DiagramNode;
+
+/**
+ * Domain meta data for diagram nodes
+ * @author artem
+ */
+public interface NodeMetaInfoProvider {
+
+	//EObject getContainer(DiagramNode node);
+	EStructuralFeature getContainmentFeature(DiagramNode node);
+	EStructuralFeature getContainmentFeature(DiagramNode node, ChildNode childNode);
+}